Merge remote-tracking branch 'frappe/develop' into wip-4.1
removed inline styling and fancy formatting for emails
removed inline styling and fancy formatting for emails
fix frappe/frappe#516
added feature to add print formats to reports using john resig's microtemplates
added feature to add print formats to reports using john resig's microtemplates
build: ability to add html files as frappe.templates[filename] and related fixes to query report
website route rewrite - started frappe/frappe#600
make links between user and role permission manager frappe/erpnext#1803
added patches for build_website and removed website template frappe/frappe#600
closes frappe/frappe#600
fixes for statics -> statics will be built after fixtures
cleaned up verbosity
fix hooks for website
fixed routing of templates.genertors
sync, sort
fix for website routing / renaming
Merge pull request #620 from rmehta/wip-4.1

Print Formats for Reports and New Website Routing Model
Merge remote-tracking branch 'frappe/develop' into wip-4.1

Conflicts:
	frappe/patches.txt
Merge remote-tracking branch 'frappe/develop' into wip-4.1