Fixed revisions.
Merge branch 'master' of https://github.com/Brc509/Settlers

Conflicts:
	server/src/catan/model/JsonPlugin.java