Merge branch 'master' of https://code.bizgaze.com/dsaisudheer3772/BizgazeUI

# Conflicts:
#	assets/js/setting.js

assets/js/setting.js

@@ -1,4 +1,8 @@
 export function _serverUrl() {
+<<<<<<< HEAD
     // sachin commitw
+=======
+    // sudheer 1.0 new branch
+>>>>>>> 3f581491210a99ac539a898f1cccb5f8fbdb5815
     return 'http://localhost:3086/';
 }