Added default constructor
Merge branch 'master' of https://github.com/FastFoodFaster/server.git

Conflicts:
	src/main/java/com/fff/domain/Order.java