Hello, World.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Migrate source files into maven directory structure
Add Mockito, update JUnit and correct version number in pom.xml
Move resources into Maven directory structure
Use Java 1.7 in pom.xml
Fix broken message resets
Remove obsolete ant build file
Forgot to delete those
Replace %VERSION% token with Maven project version