[issue] webnotes/erpnext#647 - recurring event for employee birthdays
[fix] pos settings - replace customer account with customer
Merge branch 'master' of git://github.com/akhileshdarjee/erpnext into akhileshdarjee-master

Conflicts:
	accounts/doctype/pos_setting/pos_setting.txt
	patches/patch_list.py
[fix] [minor] fixes after merging akhilesh's changes
Merge branch 'master' of github.com:webnotes/erpnext