[minor] fixed globals and patch for wsgi migration
[minor] fixes to form layouts
[minor] [fixes] view in website and other fixes
Merged master into wsgi
Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi
[fix] [minor] merge conflict fixed