Sorttable etc
Merge branch 'master' of github.com:Alexiscap/slyset

Conflicts:
	assets/javascript/slyset.js