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

Conflicts:
	locations.py
2014.08.25.1804
Merge branch 'master' of https://github.com/bradleyrp/membrain
2014.08.27.1459
2014.08.27.1730
2014.09.30.1725
2014.09.02.1937
2014.09.03.1427
2014.09.02.1832
2014.09.05.1429
2014.09.11.0930
Merge branch 'master' of http://github.com/bradleyrp/membrain
2014.09.11.1335
Merge branch 'master' of https://github.com/bradleyrp/membrain
2014.09.11.1339
2014.09.12.1438