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

Conflicts:
	autoMessage/src/com/salyangoz/model/Profile.java
Merge branch 'master' of https://github.com/salyangoz/iamat.git
.