Removed comments from bonus types
merge from master
merged from master
Fixed problem with dropdowns and bonuses
Fixed spacing on new/edit bonuses
added mr lunsford and smith to the program
removed wrongly named css file
Fixed team summary and also another bug in the user.rb
Test of authentication
Merge branch 'master' into staging
Turned auth off on staging and relaxed some page restrictions
fixed error with project path