making small changes
Merge branch 'master' of https://github.com/pgerlich/conquestOnline