Merge branch 'master' of http://106.54.229.239:3000/hello/SDK

# Conflicts:
#	HBuilder-Hello/HBuilder-Hello.xcodeproj/project.pbxproj
#	HBuilder-Hello/Podfile