Signed-off-by: Administrator <Administrator@PC-20140416MHVD.lan>
Merge remote-tracking branch 'origin/master'

Conflicts:
	linux4pkuss/templates/admin/theme/themeList.tpl