edit: location based now
collections: minor update to the description
home: the move from resource --> location
Merge branch 'master' of https://github.com/SocialZazu/socialzazu

Conflicts:
	server/methods.js