add condition logic and/or in admin, fix logic in front, fix condition required fields in edit profile

package.json

@@ -33,8 +33,13 @@
     "grunt-contrib-watch": "~0.6.1",
     "grunt-modernizr": "~0.6.0",
     "grunt-wp-assets": "~0.2.6",
+    "gulp": "^3.9.1",
     "gulp-rename": "^1.2.2",
+    "gulp-uglify": "^3.0.1",
     "load-grunt-tasks": "~1.0.0",
     "time-grunt": "~1.0.0"
+  },
+  "dependencies": {
+    "gulp-install": "^1.1.0"
   }
 }