maybe fix på layouts
Merge branch 'develop' of https://github.com/figa12/sw606f13 into develop
Merge branch 'develop' of https://github.com/figa12/sw606f13.git into develop
deletepictogram bug, settag
Merge branch 'develop' of https://github.com/figa12/sw606f13.git into
develop

Conflicts:
	source/Train/src/dk/aau/cs/giraf/train/opengl/GameActivity.java
Gameconfiguration, ændret Pictogram to Long