number format fix
Merge branch 'master' of github.com:webnotes/erpnext
added new calendar and renamed holiday block list
Merge branch 'master' of github.com:webnotes/erpnext
added leave applications and block lists to calendar
added calendar view
request: remove _type from form
email to leave approver and employee
fix in patches
Merge branch 'master' of github.com:webnotes/erpnext
added view selector and calendar view for leave application
Merge branch 'master' of github.com:webnotes/erpnext
removed calendar and  fix
added event patch in patch list
Merge branch 'master' of github.com:webnotes/erpnext

Conflicts:
	patches/patch_list.py
Merge branch 'master' into edge