export functionality
Cancel vote functionality
Merge branch 'master' into hkrs12
Merge cancel vote functionality
Conflicts:
	VoterApp/res/values/strings.xml
	VoterApp/src/ch/bfh/evoting/voterapp/entities/VoteMessage.java
	VoterApp/src/ch/bfh/evoting/voterapp/network/AbstractNetworkInterface.java
	VoterApp/src/ch/bfh/evoting/voterapp/util/BroadcastIntentTypes.java