#165 Cake(pie) is a lie
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/Plugin/Sejmometr/webroot/js/sejmometr.js
merge