Add method e and d on local after confkicting 1
Merge branch 'development' of
https://github.com/ganesan-sree/easymedJava.git into development

Conflicts:
	easymedDev/src/com/easymed/User.java