Merge branch 'master' of https://github.com/iomodo/FreeuniRestaurant

Conflicts:
	src/ge/edu/freeuni/restaurant/logic/DBConnector.java