Work on menu system
Merge branch 'master' of https://github.com/knivmakkara/fmu-client

Conflicts:
	app/scripts/app.js
	app/views/eavrop/compensation.html
	app/views/eavrop/eavrop.html