Added .jar to lib
Merge remote-tracking branch 'origin/refactoring' into refactoring

Conflicts:
	.classpath