Update Version warning
Merge remote-tracking branch 'origin/master'

Conflicts:
	locationservice.min.js