Merge branch 'master' of https://github.com/CampusConnect/campus-connect-rails into CampusConnect-master
-Facebook password will be set to 'password123' by default
Merge branch 'master' of https://github.com/shiva404/campus-connect-rails