Changing the license to Apache License 2.0
Merge remote-tracking branch 'rp/master'
Merge remote-tracking branch 'rp/master'
Changes to classpath
Merge remote-tracking branch 'rp/master'

Conflicts:
	.classpath
Merge remote-tracking branch 'rp/master'

Conflicts:
	.classpath
Cleanup of pom.xml, and added the lib/jar files.
Merge remote-tracking branch 'origin'

Conflicts:
	pom.xml