just the beginning
Merge branch 'master' into feature-groups

Conflicts:
	client/views/map/filters.coffee
spacing changes
Merge branch 'feature-groups' of https://github.com/NewSpring/NSMaps into feature-groups
Remove call to updateUserRoles from client.
trying to get the server function called in the client.
Merge branch 'master' into feature-groups

Conflicts:
	client/views/map/mapPage.coffee
Merge branch 'master' into feature-groups
working on server side functions.
Merge branch 'master' into feature-groups

Conflicts:
	server/publication.coffee
Trying to store roles to the user.
Merge branch 'master' into feature-groups
large amounts of work done on groups and group pinning
fix merge conflicts
updated meteor
Merge pull request #20 from NewSpring/feature-groups

Feature groups