User authentication and logout functions
Merge branch 'master' into feature/authentication

Conflicts:
	app/models/user.rb
	app/views/layouts/application.html.erb
	config/routes.rb
	db/schema.rb
Merge pull request #5 from vltlabs/feature/authentication

Feature/authentication
Merge branch 'master' into feature/frontend