Merge branch 'networknamechangefix' into allupdates

Conflicts:
	QuasselDroid/src/main/java/com/iskrembilen/quasseldroid/Network.java
Merge branch 'networksetcurrentserver' into allupdates

Conflicts:
	QuasselDroid/src/main/java/com/iskrembilen/quasseldroid/io/CoreConnection.java
	QuasselDroid/src/main/java/com/iskrembilen/quasseldroid/service/CoreConnService.java
	QuasselDroid/src/main/res/values/ids.xml