V7.1.3

JD
Merge branch 'master' of https://github.com/s3su/Vlothie_v1.0

Conflicts:
	Resources/iphone/alloy/controllers/home.js