Made blacklist as string array.
Merge branch 'NewFeatures'

Conflicts:
	ParseUnit/src/com/army_builder/Option.java
Made blacklist as string array, added constructor