Merge branch 'master' into release

Author: ssddanbrown

database/migrations/2014_10_12_000000_create_users_table.php

@@ -21,10 +21,10 @@ public function up()
             $table->timestamps();
         });
 
-        \BookStack\User::create([
+        \BookStack\User::forceCreate([
             'name' => 'Admin',
             'email' => '[email protected]',
-            'password' => \Illuminate\Support\Facades\Hash::make('password')
+            'password' => bcrypt('password')
         ]);
     }