Fix
Merge branch 'gcm_sending' of https://github.com/romanSS/sw14_xp_03 into gcm_sending

Conflicts:
	SeasIM/src/at/tugraz/sw/seas/gui/Chat.java