Making minor changes
Merge branch 'master' of https://github.com/searchbox/framework

Conflicts:
	src/main/webapp/WEB-INF/views/index.jspx
	src/main/webapp/WEB-INF/views/layouts/default.jspx