.
Merge remote-tracking branch 'origin/master'

Conflicts:
	autoMessage/src/com/salyangoz/automessage/MainActivity.java