Smsettings changed: sorting with javascript now works properly
Smsettings changed: know sorting with javascript works properly
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/smsettings.jsp
Smsettings changed: sorting with javascript now works properly