Merge pull request #216 from tkowark/develop

Refactorings + Improvements
Merge pull request #228 from tkowark/develop

Sprint #4 Team-AK
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Merge branch 'develop'
about page is now under /de or /en
fix #284
#260

fixed control label having only Titlecase on first word
#magic
fixed test for #289
Merge remote-tracking branch 'origin/develop' into develop-ja

Conflicts:
	spec/controllers/staff_controller_spec.rb