m
mMerge branch 'master' of https://github.com/Alan502/friendlycommuter

Conflicts:
	GeoCommute/admin.pyc
	GeoCommute/views.pyc