fix in print table after re-entry of incorrect code due to auto-merge
Merge branch 'master' of github.com:webnotes/wnframework
added validation for save conflict in single types too
Merge branch 'master' of github.com:webnotes/wnframework
use get global default instead of from control panel for getting date_format and session_expiry
Merge branch 'master' of github.com:webnotes/wnframework
fixes in defaults
Merge branch 'master' into edge