/city invite and accept added !

Committed to master
Merge branch 'master' into commandList

Conflicts:
	.idea/workspace.xml
	src/main/java/net/theviolentsquirrels/commands/CityCommand.java
	src/main/java/net/theviolentsquirrels/main/Main.java
	target/TheViolentSquirrels2-1.0.jar
	target/classes/net/theviolentsquirrels/commands/CityCommand.class
	target/classes/net/theviolentsquirrels/main/Main.class
	target/maven-archiver/pom.properties
	target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst