Fourth Commit Test
Merge branch 'Develop' into Release

Conflicts:
	GibGen.java
emergency refactoring!!!
Final testing changes