commiting to pull
Merge branch 'master' of http://github.com/hsad/cocaine

Conflicts:
	Cocaine/src/resource.js