test
Merge branch 'master' of https://github.com/huhuanming/motor

Conflicts:
	Android/Moto/src/com/moto/utils/DateUtils.java