Authentication model components
Merge branch 'master' of github.com:staxworks/maximilian-the-dog

Conflicts:
	Gemfile.lock