Merge branch 'master' of https://github.com/JasaNiklanovic/KPS

Conflicts:
	js/router/PageRouter.js