ALPHA 1.7.1
....
ALPHA 1.7.1
....
Merge origin/Netbeans into Netbeans

Conflicts:
	Rogue Re-Rezzed/src/core/Rogue.java