fixed merge conflicts

hacked templates landing page to work

updated user model to allow signin_signout to detect permissions(admin/orgadmin)

get rid of explcit urls in admin/superadmin links

renamed layout partials to remove reference to dmponline. Updated configurations so that the code default assets are stored in lib/assets and any instance specific versions would be stored within app/assets. Move static page content out of the large locales files and placed examples of them into config/locales/static_pages