change static dir to resources for Openshift
Fix permission error when deploying to Openshift
fix paths for openshift
Merge branch 'openshift' of https://github.com/mistio/mist.io into openshift
Build js with new paths
fix delete button positioning on rules
Merge branch 'master' into alert-fixes
update the ui for rules
fix rule deletion
fix spinner when changing slider on rules
fix duplicate rules bug
more comprehensive ui when adding a new rule
stop polling after disabling monitoring
add a comment
Automated built of mist.js
Merge branch 'master' of https://github.com/mistio/mist.io
Automated built of mist.js
Merge branch 'openshift'

Conflicts:
	src/mist/io/static/build/mist.js
Automated built of mist.js
add rackspace syd to providers