Merge branch 'master' of https://github.com/Eduki/eduki into backbone-templates
fixed broken id, ready for merge
Merge branch 'backbone-templates' of https://github.com/Eduki/eduki into backbone-templates