Merge branch 'master' into dev

Conflicts:
	views/template.html
Merge branch 'master' into dev

Conflicts:
	views/template.html
Merge branch 'master' into dev

Conflicts:
	views/template.html
Teste
Merge branch 'master' into dev
Teste
Merge branch 'master' into dev
Teste
Teste
Teste
Merge branch 'master' into dev
GRUNT COMMIT PARA O BRANCH (dev)
Merge branch 'master' into dev
GRUNT COMMIT PARA O BRANCH (dev)
Merge branch 'master' into dev
GRUNT COMMIT PARA O BRANCH (dev)
Merge branch 'master' into dev
T
Merge branch 'master' into dev
GRUNT COMMIT PARA O BRANCH (dev)