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

Conflicts:
	js/router/PageRouter.js
Merge branch 'master' of https://github.com/JasaNiklanovic/KPS

Conflicts:
	js/router/PageRouter.js
Merge branch 'master' of https://github.com/JasaNiklanovic/KPS

Conflicts:
	js/router/PageRouter.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
	prijava-bus.html
Merge branch 'master' of https://github.com/JasaNiklanovic/KPS

Conflicts:
	js/router/PageRouter.js