Merge branch 'master' into edge

Conflicts:
	patches/march_2013/p07_update_valuation_rate.py
	patches/patch_list.py
Merge branch 'edge' of github.com:webnotes/erpnext into edge

Conflicts:
	patches/march_2013/p07_update_valuation_rate.py