Modified the pom.xml to compile under Java 1.5
Modified the pom.xml for the project to compile under java 1.6
Merge branch 'master' of https://github.com/Gladhus/pushy

Conflicts:
	pom.xml
Modified pom.xml to compile under Java 1.6