jonathan's changes
Merge branch 'master' of https://github.com/jbuhacoff/netvote

Conflicts:
	src/main/java/net/buhacoff/netvote/server/jetty-hightide-7.6.9.v20130131/NetvoteServer.class
	src/main/java/net/buhacoff/netvote/server/jetty-hightide-7.6.9.v20130131/NetvoteServer.java
	src/main/java/net/buhacoff/netvote/server/jetty-hightide-7.6.9.v20130131/webapps/Netvote/WEB-INF/classes/NetvoteServer.class
added network code to work with stephen's server