fixed some minor errors regarding the json data files.
cant remember what I changed, hopefully it was not specific to what I
was doing.
Merge branch 'master' into data-api-refactor

Conflicts:
	core/src/main/java/com/clinkworks/neptical/util/JsonUtil.java
	src/main/java/com/clinkworks/neptical/DataRegistry.java
	src/main/java/com/clinkworks/neptical/util/Common.java
	src/test/java/com/clinkworks/neptical/data/file/DataApiIntegrationTest.java