Big Commit
Merge branch 'master' of https://github.com/andzelastojanoska/food_order

Conflicts:
	FoodOrderCompleteV3/src/main/java/com/seavus/foodorder/dao/RestaurantDAOImpl.java
	FoodOrderCompleteV3/src/main/java/com/seavus/foodorder/dao/RoleDAO.java
	FoodOrderCompleteV3/src/main/java/com/seavus/foodorder/dao/RoleDAOImpl.java
	FoodOrderCompleteV3/src/main/java/com/seavus/foodorder/gui/OrderPanel.java
	FoodOrderCompleteV3/src/main/java/com/seavus/foodorder/gui/WelcomePanel.java
	FoodOrderCompleteV3/src/main/java/com/seavus/foodorder/model/Restaurant.java
	FoodOrderCompleteV3/src/main/java/com/seavus/foodorder/service/RestaurantManager.java
	FoodOrderCompleteV3/src/main/java/com/seavus/foodorder/service/RestaurantManagerImpl.java
	FoodOrderCompleteV3/src/main/java/com/seavus/foodorder/service/RoleManager.java
	FoodOrderCompleteV3/src/main/java/com/seavus/foodorder/service/RoleManagerImpl.java
dobro