Make the template more sensible to error
Fix json notation for IE
Merge branch 'sonata/master'