Fix oss url bug
Merge remote-tracking branch 'origin/SANY' into SANY

Conflicts:
	src/com/jiketech/SpotInspection/app/AppConfig.java
update dev mode