Merge branch 'master' into edge
[slickgrid] [upgrade] added copy-paste to excel thanks to http://labs.nereo.com/SlickGrid/plugins/slick.cellexternalcopymanager.js
[data import tool] [fix] empty columns logic
Merge branch 'master' of github.com:webnotes/wnframework
Merge branch 'master' into edge
[data import tool] [fix] use get_field method of model/doctype.py
[listview] [label] show appropriate tooltip for bar graph
added qet_query option on report filters
Merge branch 'master' of github.com:webnotes/wnframework
[rename] [validation] validate new name given on rename and strip leading and trailing spaces
Merge branch 'master' into edge
Merge branch 'edge' of github.com:webnotes/wnframework into edge
Merge branch 'master' into edge

Conflicts:
	core/page/data_import_tool/data_import_tool.py
Merge branch 'edge' of github.com:webnotes/wnframework into edge
Merge branch 'master' of github.com:webnotes/wnframework
fixes in listview bar-graph
Merge branch 'master' into edge
[website] [message.html template] fixes
Merge branch 'master' into edge
[fields] [fix] bug fix when clearing a field the first time