Layout is now flexible.
Merge branch 'master' of https://github.com/Brugselaar/CP3_eindopdracht_groep23

Conflicts:
	Project/src/be/devine/cp3/conversion/services/JSONService.as