Merge pull request #7 from rock-doves-2014/daniel

Daniel
Merge changes from master
Added bcrypt functionality
Merge branch 'master' into survey_routes
added changes on css
Merge branch 'master' into daniel