Merge branch 'master' of http://192.168.0.115:3000/4dkankan/laser_v1

main.js

@@ -202844,8 +202844,8 @@ and limitations under the License.
        ,
        t
    }();
-   e.WelcomeScreenDirective = h,
-   s.module("IVWebApp").directive("welcomeScreen", h.factory())
+  // e.WelcomeScreenDirective = h,
+   //s.module("IVWebApp").directive("welcomeScreen", h.factory())
 }
 , function(t, e, n) {
    var i = "WelcomeScreenUI/WelcomeScreen.html"