Switching development
Found out queue is not handled correctly
Rewriten complete
Merge remote-tracking branch 'origin/development'

Rewriten and add Grunt for generation