Fixed issues 1, 2, 3, 5, 6, 7, 10, 11, 12 and 13
Merge branch 'master' of github.com:minicl55/civtrade
Fixed issues 1, 2, 3, 5, 6, 7, 10, 11, 12 and 13