Merged conflict
Merge branch 'development' of https://github.com/SETeam42014/test.git
into development

Conflicts:
	POS/src/test/java/domain/data/SoldItemTest.java