Initial commit
Merge branch 'master' into initial

Conflicts:
	src/com/marksomnian/icat/Utils.java
Cleanup