merge
Merge branch 'master' of https://github.com/mobitar/objc-categories
Merge branch 'master' of https://github.com/mobitar/objc-categories