Merge branch 'refs/heads/add_subtract_columns'

Conflicts:
	css/styles.css
	js/freeboard/plugins/freeboard.datasources.js
Merge branch 'refs/heads/master' into gh-pages