Api pages
API pages
Merge branch 'gh-pages' of github.com:SensorFlare/rest-api into gh-pages

Conflicts:
	dashboards.html