Fixed timezone problems

It was hard (that's what she said)
Merge branch 'dev' of github.com:MitchelCabuloy/Syllia into dev
Rubric now shows last modified

Also refractored the way json enters the template