Started adding user signup/login/logout/password_reset functionality
Merge branch 'master' of github.com:pacso/rails-app-base

Conflicts:
	.travis.yml