GUI adaptation
Merge branch 'master' of https://github.com/jritter/VoterApp.git

Conflicts:
	VoterApp/src/ch/bfh/evoting/voterapp/NetworkConfigActivity.java