model based
Merge branch 'develop' of https://github.com/JWayGroup/qrvox-rails into develop

Conflicts:
	app/views/layouts/_menu.html.erb
	config/routes.rb