wei check voter write voter
Merge branch 'master' of https://github.com/Veirday/voting

Conflicts:
	src/auth.cpp
	src/general_api.h
	src/voter.cpp