Started work on sort bar
Merge remote-tracking branch 'origin'

Conflicts:
	src/main/webapp/WEB-INF/views/main/layout.jsp