Allow for multiple icon types in info spots.
Merge branch 'master' of https://github.com/timbocek/DungeonSketch

Conflicts:

	DungeonSketch/src/main/java/com/tbocek/android/combatmap/model/primitives/Information.java