Merge branch 'v1.0'

Conflicts:
	public/themes/default/css/table.css