Merge branch 'master' into develop
Should I use NSDecimalNumber to deal with money?
Merge branch 'develop'