added permission mapping
Merge branch 'master' of https://github.com/UniCopa/CopaServer

Conflicts:
	src/main/java/unicopa/copa/server/CopaSystem.java
	src/main/java/unicopa/copa/server/servlet/CopaServlet.java
	src/test/java/unicopa/copa/server/ClientSimulationTest.java