20140327 commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/js/extLocation.js
20140409 s commit
Merge remote-tracking branch 'origin/master'