2014.08.23.1900
2014.08.23.1900
Merge branch 'master' of http://github.com/bradleyrp/membrain

Conflicts:
	locations.py