commited gangadhar
Merge branch 'master' of git://github.com/webnotes/wnframework

Conflicts:
	core/doctype/profile/profile.py
	public/js/wn/misc/user.js
	webnotes/widgets/moduleview.py