added JS logic to prevent is_test and is_public from both being true on the project edit page. Also added include to projects show page so that it pulls in the projects.js file

Merge branch 'master' into postgresql

moved assets from app/assets to lib/assets. The files in lib/assets will be used by Rails unless override by an equivalent file in app/assets. Added logic to applicationController so that it will look first for a template in app/views/[:branded folder name] before using the default in app/views