lots of changes
Merge branch 'master' of https://github.com/danboey/LocationBasedMessaging

Conflicts:
	lbm_mong/api.py
	lbm_mong/signals.py