rest create/read/delete categories
Merge branch 'master' of https://github.com/ThonkTeam/Thonk

Conflicts:
	target/classes/org/thonk/rs/ThonkAPI.class
	target/maven-archiver/pom.properties
	target/thonk.war
	target/thonk/WEB-INF/classes/org/thonk/rs/ThonkAPI.class