Added more tests and worked on Convert.java
Merge branch 'master' of github.com:SpaceTeam/JavaLib

Conflicts:
	JavaLib/src/com/punchline/javalib/tests/EntityTest.java