.
Merge branch 'master' of https://github.com/salyangoz/iamat.git

Conflicts:
	autoMessage/src/com/salyangoz/service/PhoneService.java