aa
Merge branch 'master' of https://github.com/fabmichaela/MAMO

Conflicts:
	views/global.haml
t2