Misc, getting autocomplete working
Merge branch 'master' of https://github.com/Jacketpages/Jacketpages

Conflicts:
	app/Controller/UsersController.php