midtvejs commit
Merge branch 'develop' of https://github.com/figa12/sw606f13 into develop

Conflicts:
	source/Train/src/dk/aau/cs/giraf/train/profile/CustomiseLinearLayout.java