saving good xmls for now
Merge branch 'WebserverRevision' of https://github.com/mdb92nc/STAR-Vote into WebserverRevision

Conflicts:
	web-server/project/target/resolution-cache/reports/default-web-server-build-compile-internal.xml
	web-server/project/target/resolution-cache/reports/default-web-server-build-docs.xml
	web-server/project/target/resolution-cache/reports/default-web-server-build-plugin.xml
	web-server/project/target/resolution-cache/reports/default-web-server-build-pom.xml
	web-server/project/target/resolution-cache/reports/default-web-server-build-provided.xml
	web-server/project/target/resolution-cache/reports/default-web-server-build-scala-tool.xml
	web-server/project/target/resolution-cache/reports/default-web-server-build-sources.xml
	web-server/project/target/resolution-cache/reports/default-web-server-build-test.xml
	web-server/target/resolution-cache/reports/web-server-web-server_2.10-compile-internal.xml
	web-server/target/resolution-cache/reports/web-server-web-server_2.10-compile.xml
	web-server/target/resolution-cache/reports/web-server-web-server_2.10-docs.xml
	web-server/target/resolution-cache/reports/web-server-web-server_2.10-plugin.xml
	web-server/target/resolution-cache/reports/web-server-web-server_2.10-provided.xml
	web-server/target/resolution-cache/reports/web-server-web-server_2.10-runtime-internal.xml
	web-server/target/resolution-cache/reports/web-server-web-server_2.10-runtime.xml
	web-server/target/resolution-cache/reports/web-server-web-server_2.10-sources.xml
	web-server/target/resolution-cache/reports/web-server-web-server_2.10-test-internal.xml
	web-server/target/resolution-cache/reports/web-server-web-server_2.10-test.xml
	web-server/target/resolution-cache/web-server/web-server_2.10/1.0-SNAPSHOT/resolved.xml.properties
Merge branch 'WebserverRevision' of https://github.com/mdb92nc/STAR-Vote into WebserverRevision
Merge remote-tracking branch 'origin/WebserverRevision' into WebserverRevision

Conflicts:
	web-server/project/target/resolution-cache/reports/default-web-server-build-compile-internal.xml
	web-server/project/target/resolution-cache/reports/default-web-server-build-docs.xml
	web-server/project/target/resolution-cache/reports/default-web-server-build-plugin.xml
	web-server/project/target/resolution-cache/reports/default-web-server-build-pom.xml
	web-server/project/target/resolution-cache/reports/default-web-server-build-provided.xml
	web-server/project/target/resolution-cache/reports/default-web-server-build-scala-tool.xml
	web-server/project/target/resolution-cache/reports/default-web-server-build-sources.xml
	web-server/project/target/resolution-cache/reports/default-web-server-build-test.xml
	web-server/target/resolution-cache/reports/web-server-web-server_2.10-compile-internal.xml
	web-server/target/resolution-cache/reports/web-server-web-server_2.10-compile.xml
	web-server/target/resolution-cache/reports/web-server-web-server_2.10-docs.xml
	web-server/target/resolution-cache/reports/web-server-web-server_2.10-plugin.xml
	web-server/target/resolution-cache/reports/web-server-web-server_2.10-provided.xml
	web-server/target/resolution-cache/reports/web-server-web-server_2.10-runtime-internal.xml
	web-server/target/resolution-cache/reports/web-server-web-server_2.10-runtime.xml
	web-server/target/resolution-cache/reports/web-server-web-server_2.10-sources.xml
	web-server/target/resolution-cache/reports/web-server-web-server_2.10-test-internal.xml
	web-server/target/resolution-cache/reports/web-server-web-server_2.10-test.xml
	web-server/target/resolution-cache/web-server/web-server_2.10/1.0-SNAPSHOT/resolved.xml.properties
	web-server/target/scala-2.10/src_managed/main/views/html/aboutUs.template.scala
	web-server/target/scala-2.10/src_managed/main/views/html/admin.template.scala
	web-server/target/scala-2.10/src_managed/main/views/html/badPage.template.scala
	web-server/target/scala-2.10/src_managed/main/views/html/challengeballot.template.scala
	web-server/target/scala-2.10/src_managed/main/views/html/challengedballotfound.template.scala
	web-server/target/scala-2.10/src_managed/main/views/html/confirmballot.template.scala
	web-server/target/scala-2.10/src_managed/main/views/html/index.template.scala
	web-server/target/scala-2.10/src_managed/main/views/html/main.template.scala
Fixed our web-server woes, sort of.