Minor clean-up
Merge branch 'master' of https://github.com/avassilenko/dayjayou

Conflicts:
	application/configs/navigation.xml