Switch promise to q
Remove a log
Change jquery to jQuery
Correct some errors with http resources and collections
Merge branch 'version-2'

Conflicts:
	package.json