.
Merge branch 'master' of
http://cartesio88@github.com/cartesio88/minerva.git

Conflicts:
	.project