Merge pull request #32 from LeiZHAO5/next

Next:Test for test_http_json_SUITE(ok)
Merge remote-tracking branch 'jean/next' into next
Merge https://github.com/jeanparpaillon/erocci into next
add comment
Merge remote-tracking branch 'jean/next' into next

Conflicts:
	rebar.config
	test/occi_http_json_SUITE.erl
Add comment, Change the names of resources files, Add issues #35 #34, Close #27
Merge pull request #36 from LeiZHAO5/next

Next:Test json(add comment,    add #34 #35,     close #27 #30)