Update routes paths and links href
Merge branch 'master' of github.com:azadorozhniy/poc

Conflicts:
	src/webapp/js/templates/header.tpl.html