Exceptions and refactoring
Exceptions and refactoring
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/se/kth/id2212/marketplace/server/MarketPlace.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/se/kth/id2212/marketplace/server/MarketPlace.java