website settings social icons
Merge branch 'master' of github.com:webnotes/wnframework
data import tool - convert type based on fieldtype for int, check, currency and float
updates to website footer
Merge branch 'master' of github.com:webnotes/wnframework
Merge branch 'master' of github.com:webnotes/wnframework into edge

Conflicts:
	webnotes/locale/_messages_py.json