diff --git a/index.js b/index.js
index 3e836491a4..47e00976bb 100644
--- a/index.js
+++ b/index.js
@@ -47,7 +47,11 @@ var start = function (callback) {
         console.log('MongoDB: ' + mongoPort);
         console.log('webPort: ' + webPort);
         child_process.exec('kill $(ps aux -e | grep PURPOSE=KITEMATIC | awk \'{print $2}\') && rm ' + path.join(dataPath, 'mongod.lock'), function (error, stdout, stderr) {
+<<<<<<< HEAD
           var mongoChild = child_process.spawn(path.join(__dirname, 'resources', 'mongod'), ['--bind_ip', '127.0.0.1', '--dbpath', dataPath, '--port', mongoPort, '--unixSocketPrefix', dataPath], {
+=======
+          var mongoChild = child_process.spawn(path.join(process.cwd(), 'resources', 'mongod'), ['--bind_ip', '127.0.0.1', '--dbpath', dataPath, '--port', mongoPort, '--unixSocketPrefix', dataPath], {
+>>>>>>> master
             env: {
               PURPOSE: 'KITEMATIC'
             }
@@ -55,6 +59,7 @@ var start = function (callback) {
           var started = false;
           mongoChild.stdout.setEncoding('utf8');
           mongoChild.stdout.on('data', function (data) {
+            console.log(data);
             if (data.indexOf('waiting for connections on port ' + mongoPort)) {
               if (!started) {
                 started = true;
diff --git a/meteor/client/lib/startup.js b/meteor/client/lib/startup.js
index ac4b705df5..d0b9b6ba8e 100644
--- a/meteor/client/lib/startup.js
+++ b/meteor/client/lib/startup.js
@@ -13,7 +13,6 @@ Meteor.startup(function () {
     console.log('Created Kitematic .images directory.');
     fs.mkdirSync(Util.KITE_IMAGES_PATH);
   }
-
   if (!fs.existsSync(Util.getResourceDir())) {
     fs.mkdirSync(Util.getResourceDir());
   }
diff --git a/meteor/client/views/dashboard/apps/dashboard-single-app.html b/meteor/client/views/dashboard/apps/dashboard-single-app.html
index baa2df2470..f9f86d0acf 100755
--- a/meteor/client/views/dashboard/apps/dashboard-single-app.html
+++ b/meteor/client/views/dashboard/apps/dashboard-single-app.html
@@ -22,7 +22,11 @@
       <small><a onclick="trackLink('app image detail')" href="/images/{{image._id}}">{{image.meta.name}}</a></small>
     </h5>
     <div class="options">
+      {{#if $eq status 'STOPPED'}}
+      <a href="#" onclick="trackLink('start app')" class="btn-icon btn-start" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Start App"><span class="typcn typcn-media-play-outline"></span></a>
+      {{/if}}
       {{#if $eq status 'READY'}}
+        <a href="#" onclick="trackLink('stop app')" class="btn-icon btn-stop" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Stop App"><span class="typcn typcn-media-stop"></span></a>
         {{#if url}}
           <a href="{{url}}" onclick="trackLink('view app')" class="btn-icon btn-view" target="_blank" data-toggle="tooltip" data-placement="bottom" title="View App"><span class="typcn typcn-eye-outline"></span></a>
         {{/if}}
diff --git a/meteor/client/views/dashboard/apps/dashboard-single-app.js b/meteor/client/views/dashboard/apps/dashboard-single-app.js
index d238813c3a..3897a244a1 100755
--- a/meteor/client/views/dashboard/apps/dashboard-single-app.js
+++ b/meteor/client/views/dashboard/apps/dashboard-single-app.js
@@ -32,6 +32,14 @@ Template.dashboard_single_app.events({
     AppUtil.stop(this._id);
     $('.btn-icon').tooltip('hide');
   },
+  'click .btn-start': function () {
+    AppUtil.start(this._id);
+    $('.btn-icon').tooltip('hide');
+  },
+  'click .btn-stop': function () {
+    AppUtil.stop(this._id);
+    $('.btn-icon').tooltip('hide');
+  },
   'click .btn-restart': function () {
     AppUtil.restart(this._id);
   },
diff --git a/meteor/server/publications.js b/meteor/server/publications.js
index e7421afa64..b3f5708e66 100755
--- a/meteor/server/publications.js
+++ b/meteor/server/publications.js
@@ -7,9 +7,9 @@ Meteor.publish('images', function () {
 });
 
 Meteor.publish('installs', function () {
-  return Installs.find({});
+  return Installs.find();
 });
 
 Meteor.publish('settings', function () {
-  return Settings.find({});
+  return Settings.find();
 });
diff --git a/script/versions.sh b/script/versions.sh
new file mode 100644
index 0000000000..7cfc5c99c9
--- /dev/null
+++ b/script/versions.sh
@@ -0,0 +1,11 @@
+BASE_IMAGE_VERSION=0.0.2
+BASE_IMAGE_VERSION_FILE=base-images-$BASE_IMAGE_VERSION.tar.gz
+BASE_IMAGE_FILE=base-images.tar.gz
+
+VIRTUALBOX_FILE=virtualbox-4.3.14.pkg
+
+BOOT2DOCKER_CLI_VERSION=1.2.0
+BOOT2DOCKER_CLI_VERSION_FILE=boot2docker-$BOOT2DOCKER_CLI_VERSION
+BOOT2DOCKER_CLI_FILE=boot2docker
+
+COCOASUDO_FILE=cocoasudo