Edit routes.
Edited routes.
Fixed conflict.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/webapp/jsp/templates/navigation.jsp
Merge remote-tracking branch 'origin/develop' into develop