Merge branch 'master' of https://github.com/codexa/pictroid
Fix resources.js typo
Merge branch 'master' of https://github.com/codexa/pictroid