Don't stick to shrinks namespace
Merge branch 'master' of github.com:shrink0r/es-hackfest-page

Conflicts:
	app/config/default.yml