fixed #20
Merge branch 'feature/cfp2014' of github.com:geoinquietosvlc/josm-imposm-tilemill-workshop into feature/cfp2014