Added the map still need to implement different bahaviors
Merge branch 'master' of
https://github.com/thilohaas/softwareEngineeringGWT.git

Conflicts:
	src/ch/uzh/softwareengineering/ateam/client/VotingGUI.java
	war/WEB-INF/appengine-generated/datastore-indexes-auto.xml