last commit
Merge branch 'master' of https://github.com/nkopylov/kapidarium

Conflicts:
	web/app/app/boot.js