Updates BaseController.prepare for session check flow
Updates User model to make token a User attribute
Merge branch 'users' of github.com:techiev2/HaywireAPI

Conflicts:
	app/utils/__init__.py