Bugfix and Refactoring

Refactoring:

• Upgrade of ES Version 6 : Use of "const" and "let" instead of var
• Documentation cleanups

Many minor bugfixes:

• handling of collection controls
• primitive handling
• boolean handling
• Merge dependencies