Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into companyFrontend

# Conflicts:
#	public/company-profile.html

database/migrations/2018_04_25_084609_change_email_to_mobile_from_user.php

@@ -25,6 +25,6 @@ class ChangeEmailToMobileFromUser extends Migration
      */
     public function down()
     {
-        $table->renameColumn('phone', 'email');
+        //$table->renameColumn('phone', 'email');
     }
 }

database/migrations/2018_05_26_014004_add_user_to_company_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddUserToCompanyTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('companies', function (Blueprint $table) {
+            $table->unsignedInteger('user_id');
+            $table->foreign('user_id')->references('id')->on('users');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}