Add log of exception to remove all audit warnings
Merge branch 'code_audit_fix_20141122' into develop
Merge branch 'develop' into feature-28-edit_view