button layouts, menu left
Merge branch 'master' of https://github.com/jpzimmerr/DeKoepel

Conflicts:
	Gemfile.lock