asd
Merge branch 'master' of https://github.com/HonzaMac/prcek

Conflicts:
	app/config/config.neon
Merge branch 'master' of https://github.com/HonzaMac/prcek
Merge branch 'master' of https://github.com/HonzaMac/prcek
Merge branch 'master' of https://github.com/HonzaMac/prcek

Conflicts:
	app/config/config.neon
Merge branch 'master' of https://github.com/HonzaMac/prcek
Merge branch 'master' of https://github.com/HonzaMac/prcek

Conflicts:
	app/config/config.production.neon
fix