new friends model
Merge branch 'master' of https://github.com/danboey/LocationBasedMessaging

Conflicts:
	lbm/urls.pyc
	lbm_mong/api.pyc
	lbm_mong/models.pyc
	lbm_mong/mypipeline.pyc
	lbm_mong/signals.pyc