Fixes for smarty3
fix activation icon for users not having activation permission
Merge branch 'master' into smarty3

Conflicts:
	lib/smarty_backend_plugins/function.activationbutton.php