changes due to new gui structure
changes due to new gui structure
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	papi/core.py
	papi/tests/TestCoreMock.py