Update layouts
Merge branch 'master' of https://github.com/DanielDHuynh/EDA397Team07

Conflicts:

	SupremeAgile/src/chalmers/eda397/team07/supremeagile/background/InteractiveArrayAdapter.java