Refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	common/models/place.js