initial import
Minor clean up
Merge branch 'master' of https://github.com/felipesere/collection-json-parser-annotations into develop

Conflicts:
	.gitignore