InstaCirle preparation
Merge branch 'master' of https://github.com/jritter/VotingLib.git

Conflicts:
	VotingLib/src/ch/bfh/evoting/votinglib/fragment/NetworkListFragment.java