Merge branch 'master' into html5
Merge branch 'master' into html5
Merge branch 'html5' of github.com:sudar/bright-light