FSAMS version 2.0

After months of hardship and crying code, the authors decided to take
forth action and stop the misery of non-grid era and brought a
mathematical plane to the universe of FSAMS. The creators are now
working diligently to not commit the same mistakes of the past and
bring peace to the human agents of the FSAMS universe
Merge branch 'master' of https://github.com/jnhankins/FSAMS

Conflicts:
	FSAMS/src/fsams/gui/ComponentsPanel.java
	Old FSAMS/src/fsams/gui/NewJPanel.form
	Old FSAMS/src/fsams/gui/NewJPanel.java