added timing
Merge branch 'master' of https://github.com/D6Digital/SWENGFrame.git

Conflicts:
	src/BasicExample.xml
	src/gUIModule/SlidePanel.java
Merge branch 'master' of https://github.com/D6Digital/SWENGFrame.git