Add token based auth
Add registration API responses
Merge branch 'token-authentication'
Merge branch 'master' into development

Conflicts:
	Gemfile.lock