To pangool-core 0.60.3
Merge branch 'master' of github.com:datasalt/pangool-bootstrap

Conflicts:
	app-module/pom.xml