commit
commit
Merge branch 'dev' of https://github.com/tiagofreire/bace into dev

Conflicts:
	.DS_Store
	baceerp/.DS_Store
Merge branch 'dev' of https://github.com/tiagofreire/bace into dev
Merge branch 'dev' of https://github.com/tiagofreire/bace into dev
Merge branch 'dev' of https://github.com/tiagofreire/bace into dev
comit
desenvolvimento da etiqueta