Merge remote-tracking branch 'origin/ayonix-feat/reconnect'

Conflicts:
	QuasselDroid/src/main/java/de/kuschku/quasseldroid/gui/MainActivity.java
	QuasselDroid/src/main/java/de/kuschku/quasseldroid/gui/fragments/ChatFragment.java
	QuasselDroid/src/main/java/de/kuschku/quasseldroid/service/CoreConnService.java
Merged upstream/reconnect
Merge branch 'master' of https://github.com/kuschku/QuasselDroid

Conflicts:
	QuasselDroid/src/main/java/de/kuschku/quasseldroid/gui/fragments/ChatFragment.java
	QuasselDroid/src/main/java/de/kuschku/quasseldroid/service/CoreConnService.java