fix iPhone
Merge branch 'master' of github.com:lujiajing1126/sisui_microplatform
add iphone 4 5
Merge branch 'master' of github.com:lujiajing1126/sisui_microplatform

Conflicts:
	app/.DS_Store
rm DS_Store