Merged some changes from master
Merge branch 'refs/heads/add_subtract_columns' into gh-pages

Conflicts:
	plugins/freeboard/freeboard.datasources.js