Merge branch '2.0' into popover

package.json

@@ -59,7 +59,7 @@
     "gulp-scss-lint": "^0.3.9",
     "gulp-shell": "^0.4.0",
     "gulp-strip-debug": "^1.1.0",
-    "gulp-tslint": "^4.3.4",
+    "gulp-tslint": "^5.0.0",
     "gulp-typescript": "2.12.1",
     "gulp-util": "^3.0.6",
     "gulp-watch": "^4.2.4",
@@ -87,8 +87,8 @@
     "strip-sourcemap-loader": "0.0.1",
     "systemjs": "0.19.6",
     "through2": "^0.6.3",
-    "tslint": "^3.7.1",
-    "tslint-eslint-rules": "^1.2.0",
+    "tslint": "^3.10.2",
+    "tslint-ionic-rules": "0.0.2",
     "typescript": "1.8.7",
     "vinyl": "^0.4.6",
     "webpack": "^1.12.2",
@@ -99,4 +99,4 @@
       "path": "node_modules/ionic-cz-conventional-changelog"
     }
   }
-}
+}

src/components/button/button.ts

@@ -27,6 +27,7 @@ import {isTrueProperty} from '../../util/util';
   * @property [fab-center] - Position a fab button towards the center.
   * @property [fab-top] - Position a fab button towards the top.
   * @property [fab-bottom] - Position a fab button towards the bottom.
+  * @property [fab-fixed] - Makes a fab button have a fixed position.
   * @property [color] - Dynamically set which predefined color this button should use (e.g. primary, secondary, danger, etc).
   *
   * @demo /docs/v2/demos/button/

tslint.json

@@ -1,62 +1,3 @@
 {
-    "rulesDirectory": "node_modules/tslint-eslint-rules/dist/rules",
-    "rules": {
-        "class-name": true,
-        "comment-format": [
-            true,
-            "check-space"
-        ],
-        "indent": [
-            true,
-            "spaces"
-        ],
-        "no-duplicate-variable": true,
-        "no-eval": true,
-        "no-internal-module": true,
-        "no-trailing-whitespace": true,
-        "no-var-keyword": false,
-        "one-line": [
-            true,
-            "check-open-brace",
-            "check-whitespace"
-        ],
-        "quotemark": [
-            true,
-            "single"
-        ],
-        "semicolon": [
-            true,
-            "always"
-        ],
-        "triple-equals": [
-            true,
-            "allow-null-check"
-        ],
-        "typedef-whitespace": [
-            true,
-            {
-                "call-signature": "nospace",
-                "index-signature": "nospace",
-                "parameter": "nospace",
-                "property-declaration": "nospace",
-                "variable-declaration": "nospace"
-            }
-        ],
-        "variable-name": [
-            true,
-            "ban-keywords"
-        ],
-        "whitespace": [
-            true,
-            "check-branch",
-            "check-decl",
-            "check-operator",
-            "check-separator",
-            "check-type"
-        ],
-        "no-inner-declarations": [
-            true,
-            "functions"
-        ]
-    }
-}
+  "extends": "tslint-ionic-rules"
+}