merge from dev

2016-01-12 14:55:45 -05:00 · 2016-01-12 14:55:45 -05:00 · 189942e289
commit 189942e289
parent 9e1a2cf66a
298 changed files with 53049 additions and 5413 deletions
--- a/dashboard-ui/bower_components/jquery/.jshintrc
+++ b/dashboard-ui/bower_components/jquery/.jshintrc
@ -0,0 +1,14 @@
+{
+	"boss": true,
+	"curly": true,
+	"eqeqeq": true,
+	"eqnull": true,
+	"expr": true,
+	"immed": true,
+	"noarg": true,
+	"quotmark": "double",
+	"undef": true,
+	"unused": true,
+
+	"node": true
+}