Tasks done
Merge branch 'master' of https://github.com/guaxinim/guaxinim-devops

Conflicts:
	README.md

Conflits resolved