Added log4j dependency and properties, and some logging in
SearchController.
Added log4j dependency and properties, and some logging in
SearchController.
Improved logging properties and search controller message.
Merge branch 'log4j' of https://github.com/emma-burrows/pepper into log4j

Conflicts:
	pom.xml
	src/main/java/com/pharmpress/pepper/spring/controllers/SearchController.java
	src/main/resources/log4j.properties
Corrected indentation in POM and added a developer.
Merge pull request #16 from emma-burrows/log4j

Add Log4j to project