add method k()on local
Merge remote-tracking branch 'origin/development' into development

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