Update resources
Merge branch 'master' of https://github.com/skad/GG2014