pulled from en svn
updated tilemill overview
added josm overview