Merge branch 'navigation'

Signed-off-by: Davinderpal Singh Rehal <davinderpalrehal@gmail.com>

Conflicts:
	app/routes.php