Changes made by Borislava Yosifova (borislava.yosifova@yahoo.com).
Merge branch 'master' of https://github.com/ca-miro/AppBuilder-Template.git

Conflicts:
	Template/scripts/menu.js
	Template/views/menu.html