Fixing a AJAX request crash...
Fixing some cosmetic issues reported by QuickHeal engineer...
Merge branch 'work_branch'