Změny
-
Merge branch 'master' of https://github.com/BohdanMaslowski/praetor-ionic

Conflicts:
	PraetorIonic.v12.suo
	app/loginPage.js
	app/spis/detail.html
	js/app.js
-