Fixed a missing curly brackets pair in a mail template placeholder
Fixed some missing semicolons; Removed the need for curly braces in if statements from the .jshintrc
Merge branch 'hint_and_simple_fixes' into dev