Merge branch 'master' of https://github.com/openlib/Spring-ILS

Conflicts:
	src/main/java/com/ngl/controllers/HomeController.java
	src/main/webapp/WEB-INF/ftl/shared/navigation/websiteNavigation.ftl

Merge remote-tracking branch
'origin/master'

Conflicts:
	src/main/java/com/ngl/controllers/HomeController.java
	src/main/webapp/WEB-INF/ftl/shared/navigation/websiteNavigation.ftl

website
Merge remote-tracking branch 'origin/master'