Merge branch 'master' into development
[UPDATE] updated submodule for Q.js
Merge branch 'development'
[UPDATE] minor update