Merge master into strongloopsuite-1.0

docs/gettingstarted.md

@@ -1,9 +1,21 @@
-###Getting Started
+### Getting Started
 
-
-Placeholder for LoopBack Getting Started Guides
-
-Here we want to insert the boxes - iOS, Android, HTML5/Javascript,
- REST
+<div class="row">
+  <div class="col-lg-6">
+    <a class="btn btn-success btn-lg btn-block" href="http://docs.strongloop.com/loopback-clients#ios">iOS SDK</a>
+  </div>
+  <div class="col-lg-6">
+    <a class="btn btn-success btn-lg btn-block" href="http://docs.strongloop.com/loopback-clients#android">Android SDK</a>
+  </div>
+</div>
+<br>
+<div class="row">
+  <div class="col-lg-6">
+    <a class="btn btn-success btn-lg btn-block" href="http://docs.strongloop.com/loopback-clients#javascript">HTML5/JavaScript SDK</a>
+  </div>
+  <div class="col-lg-6">
+    <a class="btn btn-success btn-lg btn-block" href="http://docs.strongloop.com/loopback#rest">REST API</a>
+  </div>
+</div>
 
 ---

lib/models/user.js

@@ -7,7 +7,7 @@ var Model = require('../loopback').Model
   , path = require('path')
   , SALT_WORK_FACTOR = 10
   , crypto = require('crypto')
-  , bcrypt = require('bcrypt')
+  , bcrypt = require('bcryptjs')
   , passport = require('passport')
   , LocalStrategy = require('passport-local').Strategy;
 
@@ -138,9 +138,9 @@ User.logout = function (sid, fn) {
 User.prototype.hasPassword = function (plain, fn) {
   if(this.password && plain) {
     bcrypt.compare(plain, this.password, function(err, isMatch) {
-  		if(err) return fn(err);
-  		fn(null, isMatch);
-  	});    
+      if(err) return fn(err);
+      fn(null, isMatch);
+    });
   } else {
     fn(null, false);
   }

package.json

@@ -16,11 +16,11 @@
     "loopback-datasource-juggler": "~1.0.0",
     "strong-remoting": "~1.0.0",
     "inflection": "~1.2.5",
-    "bcrypt": "~0.7.7",
     "passport": "~0.1.17",
     "passport-local": "~0.1.6",
     "nodemailer": "~0.4.4",
-    "ejs": "~0.8.4"
+    "ejs": "~0.8.4",
+    "bcryptjs": "~0.7.10"
   },
   "devDependencies": {
     "blanket": "~1.1.5",