added validation for save conflict in single types too
Merge branch 'master' of github.com:webnotes/erpnext
brought back master.sql.gz