add error and warning threshold for number widget
threshold checks
Merge branch 'events' into test
Merge branch 'thresholds' into test
- added size_x and size_y to all widgets
- use common_fields template for all fields used in all edit templates
style changes for new grid
Merge branch 'test'

Conflicts:
	app/assets/javascripts/services/editor_form_options.js
	app/assets/javascripts/services/flotr_graph_helper.js