Merge con desarrollo.
Merge branch 'master' of github.com:pacoqueen/ginn

Conflicts:
	geotexan.sublime-workspace