menuCtrl Test
Merge remote-tracking branch 'origin/feature/fe_tests' into feature/fe_tests

Conflicts:
	static/jasmine.html
Merge remote-tracking branch 'origin/feature/fe_tests' into feature/fe_tests
Added Test
Added Test
Merge remote-tracking branch 'origin/feature/fe_tests' into feature/fe_tests