Merge branch 'master' into step-2
DataSource added
Merge branch 'step-2'

Conflicts:
	src/main/java/nortal/lab/spring/di/dao/CustomerDaoImpl.java
	src/main/java/nortal/lab/spring/di/dao/EmployeeDaoImpl.java
	src/main/java/nortal/lab/spring/di/dao/MeetingDaoImpl.java
	src/main/resources/springContext.xml