Nogal SteenHarde commit
Merge branch 'master' of https://github.com/RadioactiveGangsters/RIDClient

Conflicts:
	IRIGui/src/irigui/IRIGui.java