#10 add custom tag factory
Merge branch 'master' of github.com:movimento-sem-terra/cms

Conflicts:
	app/index.html