subpage directive refactor to align with featureMenu
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/js/menu.js
merge a conflict into the right spot...