camera resize on reize
Merge branch 'master' into gh-pages