story 29 done done

mikael och christian
Merge branch 'master' of github.com:RichardSimko/EDA260-Team09
Merge branch 'master' of github.com:RichardSimko/EDA260-Team09
Ändrade lite i build.xml, la till acceptancetest 33b

mikael och christian
Merge branch 'master' of github.com:RichardSimko/EDA260-Team09

Conflicts:
	testfiles/Configuration/StandardTestKonfigurationsFil.txt