Merge branch 'release/1.0'
Merge branch 'release/2.0'
Update README.md
Merge branch 'master' of github.com:jaggyspaghetti/cakephp-resource-generator into develop
added the blank value validation
Merge branch 'hotfix/2.0.1' into develop