Placing the container class at the right place.
Merge branch 'develop' of https://github.com/searchbox/framework into develop

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