change comments
Merge branch 'mine-master'

* mine-master:
  Fixing suggestions from pull-request feedback
change naming style
Merge commit '5f1b2dc2d3d01f5d4011b090b24430e9b93b8a98'

* commit '5f1b2dc2d3d01f5d4011b090b24430e9b93b8a98':
  Fixing more suggestions from pull-request feedback

Conflicts:
	src/libtiled/map.h
	src/libtiled/mapwriter.h
	src/libtiled/orthogonalrenderer.cpp
Merge branch 'master' of https://github.com/digitalhoax/tiled

# By Thorbjørn Lindeijer (2) and others
# Via Thorbjørn Lindeijer (3) and Lennert Raesch (1)
* 'master' of https://github.com/digitalhoax/tiled:
  Prettier Travis CI badge
  Added Travis CI badge
  Fixed automapping object region check.
  Add Bountysource badge to README