fix fix fix verflixt ...
fucking homo conflicts scheiß hua -.-

Merge branch 'master' of https://github.com/droid87/SecureChatManager.git

Conflicts:
	src/at/fhooe/mcm30/MainActivity.java
	src/at/fhooe/mcm30/MainActivityNew.java