phpstom stuff

phpstom stuff
Merge branch 'master' of https://github.com/bahit/FacultyCooperative

Conflicts:
	app/routes.php