Merge pull request #9 from HeisenBugDev/Json

More work on JSON
JSON Mapping
Merge remote-tracking branch 'origin/Json'

Conflicts:
	src/main/java/com/heisenbugdev/heisenui/json/JSONHandler.java