shamller icons and things
Merge branch 'master' of https://github.com/kag0/BiRiTracker

Conflicts:
	src/com/blackdoor/biritracker/BiRiMapManipulator.java