hik
Merge branch 'master' of https://github.com/dcaspar/clouddata

Conflicts:
	script/jquery.tablesorter.widgets.js