Fixed #17
Merge branch 'feature/cfp2014' of https://github.com/geoinquietosvlc/josm-imposm-tilemill-workshop into feature/cfp2014