Rules UI work in progress
Merge branch 'master' into rules_ui

Conflicts:
	app/controllers/site.js
	app/views/includes/head.jade
	app/views/site/dashboard.jade
	public/js/rules.js
Upgrade Bootstrap JS to version 2.3.1.
Fixes issue with popover not appearing inside dialog.
Merge branch 'master' into rules_ui
Move the extrajs block to a better location
Move rules CSS & JS includes to extrajs block only in the needed view
Move rules dialog views into a separate rule folder
Sensor status configuration work in progress
Merge branch 'master' into rules_ui

Conflicts:
	package.json
Rules work in progress: added sensor detail selection
Move the rules creation modal to a separate page and rename the existing rules nav item Advanced Rules
Add a comment for Mark