Commit for conflict
Merge branch 'master' of https://github.com/jritter/VoterApp.git

Conflicts:
	VoterApp/res/layout/activity_network_informations.xml
	VoterApp/src/ch/bfh/evoting/voterapp/CheckElectorateActivity.java
	VoterApp/src/ch/bfh/evoting/voterapp/DisplayResultActivity.java
	VoterApp/src/ch/bfh/evoting/voterapp/ElectorateActivity.java
	VoterApp/src/ch/bfh/evoting/voterapp/ListTerminatedPollsActivity.java
	VoterApp/src/ch/bfh/evoting/voterapp/MainActivity.java
	VoterApp/src/ch/bfh/evoting/voterapp/NetworkInformationsActivity.java