changes changes
Merge branch 'master' into jscs

Conflicts:
	backend.js