#20
Merge remote-tracking branch 'origin2/master'

Conflicts:
	#templates/mylocation.htm
#20