Improvement on the json array / object side.
Merge branch 'master' of
https://github.com/S-Gr4y/Android-Model-Maker.git

Conflicts:
	src/Main.java