add method e()
Merge remote-tracking branch 'origin/development' into development

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