Merge branch 'master' of https://github.com/gosuvn/IdealPad

Conflicts:
.DS_Store
add scan doc id screen
IDP update
try git
Merge branch 'master' of https://github.com/gosuvn/IdealPad

Conflicts:
	.DS_Store
	.gitignore
	IdealPad.xcodeproj/project.pbxproj

IdealPad.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserI
nterfaceState.xcuserstate
	IdealPad/Classes/Application/IDPAppDelegate.m
	IdealPad/IdealPad-Prefix.pch
	IdealPad/en.lproj/IDPViewController.xib