Write out exported map image on background thread.
Merge remote-tracking branch 'origin/master'

Conflicts:
	DungeonSketch/src/main/java/com/tbocek/android/combatmap/ExportImageDialog.java
Fix merge conflicts in ExportImageDialog.