cosme
Fix typo
Add launch images for iphone6
Merge branch 'develop'
Fix bugs and view layouts
Merge branch 'develop'
Update podspec
Merge pull request #1 from yackle/develop

merge update
add zh-Hans.lproj

add zh-Hans.lproj
Merge branch 'add_zh-Hans.lproj' into develop
Merge pull request #66 from dabing1022/develop

add zh-Hans.lproj
Merge branch 'develop'
Merge remote-tracking branch 'upstream/master'