Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/mithrilmania/blocktopograph/map/Biome.java