Commit and Push Admin
Merge branch 'master' of https://github.com/Bregi/-ch.bfh.bti7054.w2013.q.l-c-org
Merge branch 'master' of https://github.com/Bregi/-ch.bfh.bti7054.w2013.q.l-c-org
Commit and Push Flags / Admin
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/module/Application/view/layout/layout.phtml
Commit and Push Flags / Admin