Google map added. Better support for sessions and social networks
Merge branch 'feature-map'
Merge branch 'origin/master'

Conflicts:
	server/domain/passport.js