changed routes
added new line
Merge branch 'master' into backend

Conflicts:
	app/controllers/HomeController.php
	app/routes.php
changed signup.js
Merge branch 'master' of https://github.com/omfgitsjack/justplay

Conflicts:
	public/app/modules/signup/signup.js
resolved signup.js conflict
Merge branch 'master' of https://github.com/omfgitsjack/justplay into backend
refactored some code and deleted crsf in signup.js
deleted csrf token in signup.js and refactored the code a bit.
Merge branch 'master' into backend

Conflicts:
	app/controllers/AdminController.php
	app/routes.php
resolved a small confilct in adminController
deleted signup.js.orig
Merge branch 'master' of https://github.com/omfgitsjack/justplay into backend
added a scaffold for Activities
fixed up the migrations and added userprofiles scaffold
Merge branch 'master' of https://github.com/omfgitsjack/justplay into backend
edited some routing and renamed HomeController to AuthenticationController
deleted homecontroller and routes.orig
added scaffolding
Merge remote-tracking branch 'origin' into backend

Conflicts:
	app/controllers/HomeController.php