ghz 20131123
ghz 20131123
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/views/site/_summaryview.php
	protected/views/summary/listall.php