Fixing navigation injection #53
Merge remote-tracking branch 'origin/master' into v.0.4.0

Conflicts:
	assets/js/modules/innerNavigation.js