add javadoc to ImageDownloader, ShowCommentsAdapter and
ShowPointsAdapter
resolve merge problems
Merge branch 'master' of https://github.com/enavar/UlisesMap