.
.
.
.
.
Merge branch 'master' into gh-pages

Conflicts:
	css/index.css
	js/functions.js
	js/loadAPI.js
	js/unsed-functions.js