Re organized the initComponents function.
Bugfix: parsing .fzm files had been broken by b963fbbdf54
Merge remote-tracking branch 'fizzim/master'

Conflicts:
	src/display/FizzimGui.java