Beginning of favorite button
Merge branch 'develop' of https://github.com/oSoc14/hyperRail into develop
Merge branch 'develop' of github.com:oSoc14/hyperRail into develop

Conflicts:
	app/controllers/OAuthLoginController.php
	app/routes.php
OAuthResourceController added
database-setup updated
Updates on twitter authentication and check ins
Merge branch 'develop' of https://github.com/oSoc14/hyperRail into develop
Preparing master merge
Ready for merge with master
Merge