Demo of working with databases from Spring
Merge branch 'master' of https://github.com/getjavajobs/library.git

Conflicts:
	server/pom.xml
	server/src/main/java/com/getjavajobs/library/dao/AuthorDao.java
	server/src/main/resources/jdbc.properties
	server/src/main/resources/library-context.xml
	webapp/src/main/resources/library-web-context.xml