update views\default\admin\approval\list.tpl.htm
bug fix
bug fix
Merge branch 'develop'
Merge branch 'master' into github

Conflicts:
	install/db/mysql.sql