Ezequiel Bergamaschi 2ee977c501 Merge remote-tracking branch 'origin/develop'
Conflicts:
	core-js/pom.xml
	mindplot/pom.xml
	pom.xml
	web2d/pom.xml
	wise-editor/pom.xml
	wise-webapp/pom.xml
2015-10-29 23:06:57 -03:00
..