merge commit
Merge branch 'master' of github.com:shchigi/iBeacons

Conflicts:
	iBeacons/settings.py