Text background
Merge branch 'master' of https://github.com/gdemiollis/activemtl

Conflicts:
	ActiveMtl/res/layout/form_fragment.xml