Fix issue with app crashing on a malformed JSON object
Merge branch 'master' of https://github.com/darthsuicune/CreuRoja

Conflicts:
	src/com/cruzroja/creuroja/ConnectionLoader.java