option panel
Merge branch 'master' of https://github.com/christianbueschi/nzz

Conflicts:
	javascripts/vendor/custom.js