Bytta branch ej
Merge branch 'master' of https://github.com/Agfct/SharedSwing

Conflicts:
	SharedSwing/src/test/TestClass.java