Uniqueness validation fix.
Merge branch '2.0' of https://github.com/web777/base-app into 2.0