partial fix #7689: error on setting survey permissions
Fixed issue #07688: Script errors
Merge branch '2.05' of github.com:LimeSurvey/LimeSurvey into 2.05
Merge remote-tracking branch 'origin/2.05' into 2.05
Fixed issue #7684: HTML entities visible in statistics graphs
fixed #7689: error on setting survey permissions
Merge branch '2.05' of https://github.com/LimeSurvey/LimeSurvey.git into 2.05
Fixed issue #7689: error on setting survey permissions
Fixed issue #7690: Always converts resource links when copying survey
Dev Small display fix
Dev Javascript fixes.
Fixed issue #07691: Javascript missing.
Merge branch '2.05' of github.com:LimeSurvey/LimeSurvey into 2.05

Conflicts:
	application/controllers/admin/surveypermission.php
Dev Added automatic timestamping for fields created/modified in LSActiveRecordTables
Dev Added AuditLog plugin base
Merge remote-tracking branch 'origin/2.05' into 2.05
Dev: #07692: Partial : Removing uneeded sid and gid from admin link
Dev: actually find gid and sid from qid and gid
Dev: minimal permission: surveycontent/read
Dev: update blobblueish jQuery UI - v1.10.2 (css only)
Dev: Fix blue background on highlited for blobblueish
New feature #07002: allow return to email template in email template edition