Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/components/trialCase/TrialCase.jsx

src/components/common/application/Application.js

@@ -1,11 +1,13 @@
 import React, {Component} from 'react';
-
+import ShopApp from '../../../case/shopApp/src/App'
+import billApp from '../../../case/shopApp/src/App'
+import orderApp from '../../../case/shopApp/src/App'
 class Application extends Component {
 
     render() {
         return (
             <div>
-                Application
+                <ShopApp/>
             </div>
         )
     }