Merge branch 'master' into 'bb_replaceBower'

CHANGELOG.md

Gruntfile.js

doc/CODING.md

doc/NewVersion.md

doc/PROTOCOL.md

extension/Documentation/Index.rst

extension/Documentation/Manual.rst

extension/Documentation/Release.rst

extension/Documentation/Settings.cfg

extension/Documentation/_make/conf.py

extension/RELEASE.txt

extension/ext_conf_template.txt

extension/ext_emconf.php

extension/qfq/api/download.php

extension/qfq/api/load.php

extension/qfq/qfq/AbstractBuildForm.php

extension/qfq/qfq/BuildFormBootstrap.php

extension/qfq/qfq/Constants.php

extension/qfq/qfq/File.php

extension/qfq/qfq/QuickFormQuery.php