WORKIN'
Should be merged fine now
Merge branch 'master' of https://github.com/jp2011/hack_overflow

Conflicts:
	GWT-maven-GPE-sample/target/m2e-wtp/web-resources/META-INF/maven/com.mycompany/example/pom.properties
whateva