Update
Merge branch 'master' into gh-pages

Conflicts:
	flagrate.css
	flagrate.js