[AS,KS]{Issue} Conversation View/Handling, timestamps
Merge branch 'master' of https://github.com/romanSS/sw14_xp_03

Conflicts:
	SeasIM/src/at/tugraz/sw/seas/gcm/GcmReceiver.java
	SeasIM/src/at/tugraz/sw/seas/gui/ConversationList.java