Merge pull request #118 from FWAJL/Development

Merge pull request #117 from FWAJL/master
Merge pull request #120 from FWAJL/Development

Development
Merge pull request #122 from FWAJL/Development

Development
Merge pull request #123 from FWAJL/Development

Development
Merge pull request #124 from FWAJL/Development

js rootFolder in config.js instead of utils to prevent release issues
Merge pull request #125 from FWAJL/master

Development