Ilkka Seppala
072a885ec8
Merge branch 'master' into layers
Conflicts:
layers/src/main/java/com/iluwatar/layers/App.java
layers/src/main/java/com/iluwatar/layers/Cake.java
layers/src/main/java/com/iluwatar/layers/CakeBakingException.java
layers/src/main/java/com/iluwatar/layers/CakeBakingService.java
layers/src/main/java/com/iluwatar/layers/CakeBakingServiceImpl.java
layers/src/main/java/com/iluwatar/layers/CakeDao.java
layers/src/main/java/com/iluwatar/layers/CakeInfo.java
layers/src/main/java/com/iluwatar/layers/CakeLayer.java
layers/src/main/java/com/iluwatar/layers/CakeLayerDao.java
layers/src/main/java/com/iluwatar/layers/CakeLayerInfo.java
layers/src/main/java/com/iluwatar/layers/CakeTopping.java
layers/src/main/java/com/iluwatar/layers/CakeToppingDao.java
layers/src/main/java/com/iluwatar/layers/CakeToppingInfo.java
layers/src/main/resources/applicationContext.xml