Commit
Merge branch 'master' of https://github.com/AmoebaMan/KitMaster

Conflicts:
	src/net/amoebaman/kitmaster/sql/SQLHandler.java