#18 fixed menu item active status, small refactoring on menuService and menu_spec
Merge branch 'hotfix' into develop

Conflicts:
	dist/twigs.min.js