user_account has a "current" branch
Merge branch 'master' of https://github.com/gedankennebel/clickAndEat

Conflicts:
	app/controllers/user_accounts_controller.rb
	app/views/layouts/application.html.erb
	app/views/order_items/monitor.html.erb
	app/views/user_accounts/index.html.erb