Configured Smart GWT
Merge remote-tracking branch 'origin/origin/master'

Conflicts:
	cacti-scrumtool-webapp-1.0.0/pom.xml