change menu
Merge branch 'master' of https://github.com/Proalab/cba_appraiser_soft

Conflicts:
	app/views/layouts/_header.html.erb