Fixing in the lib_json module
Merge branch 'sp4.sc2.model-auto-complete' of github.com:projectcs13/sensor-cloud into sp4.sc2.model-auto-complete

Conflicts:
	test/json_tests.erl
Adding search functionality, not finished yet
Merge branch 'sp4.sc2.model-auto-complete' of github.com:projectcs13/sensor-cloud into sp4.sc2.model-auto-complete
Cleaned up code.
Merge branch 'sp4.sc2.model-auto-complete' of github.com:projectcs13/sensor-cloud into sp4.sc2.model-auto-complete