Merge remote-tracking branch 'origin/master'

Revert "test"

This reverts commit
17968035f0bd7f5e6943403b24734d9571e985f9.

test
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/docs/assets/css/external-small.png
	assets/docs/assets/css/logo.png
	assets/docs/assets/css/main.css
	assets/docs/assets/favicon.png
	assets/docs/assets/img/spinner.gif
	assets/docs/assets/index.html
	assets/docs/assets/js/api-filter.js
	assets/docs/assets/js/api-list.js
	assets/docs/assets/js/api-search.js
	assets/docs/assets/js/apidocs.js
	assets/docs/assets/js/yui-prettify.js
	assets/docs/assets/vendor/prettify/CHANGES.html
	assets/docs/assets/vendor/prettify/COPYING
	assets/docs/assets/vendor/prettify/README.html
	assets/docs/assets/vendor/prettify/prettify-min.css
	assets/docs/assets/vendor/prettify/prettify-min.js