commit develop
Merge branch 'develop' into test

Conflicts:
	source/TesteGitSource.txt