140917
140917
Merge branch 'master' into gh-pages

Conflicts:
	docs/browser-prefix.html
	docs/browser-prefix.js.html
	docs/data-traveller.html
	docs/data-traveller.js.html
	docs/dom-attribute.html
	docs/dom-attribute.js.html
	docs/dom-modification.html
	docs/dom-modification.js.html
	docs/dom-selector.html
	docs/dom-selector.js.html
	docs/index.html
	jsdoc-template/tmpl/container.tmpl
	jsdoc-template/tmpl/details.tmpl
	jsdoc-template/tmpl/example.tmpl
	jsdoc-template/tmpl/examples.tmpl
	jsdoc-template/tmpl/exceptions.tmpl
	jsdoc-template/tmpl/layout.tmpl
	jsdoc-template/tmpl/mainpage.tmpl
	jsdoc-template/tmpl/members.tmpl
	jsdoc-template/tmpl/method.tmpl
	jsdoc-template/tmpl/params.tmpl
	jsdoc-template/tmpl/properties.tmpl
	jsdoc-template/tmpl/returns.tmpl
	jsdoc-template/tmpl/source.tmpl
	jsdoc-template/tmpl/tutorial.tmpl
	jsdoc-template/tmpl/type.tmpl
140917