Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of https://github.com/fgassert/ra2.js into gh-pages

Conflicts:
	_site/css/ra.css
	_site/js/ra.js
	css/ra.styl
	index.html
	js/ra.js