Merge branch 'master' of https://github.com/telerik/hackaton-team15.git

Conflicts:
	Eventer/views/feedView.html

Eventer/scripts/app/main.js

@@ -315,9 +315,12 @@ var app = (function () {
         var eventSelected = function (e) {
             mobileApp.navigate('views/eventView.html?uid=' + e.data.uid);
         };
+        
+        /*
         var navigateHome = function () {
             mobileApp.navigate('#welcome');
         };
+        
         var logout = function () {
             AppHelper.logout()
             .then(navigateHome, function (err) {
@@ -325,10 +328,11 @@ var app = (function () {
                 navigateHome();
             });
         };
+        */
         return {
             feed: EventsModel.events,
             eventSelected: eventSelected,
-            logout: logout
+            //logout: logout
         };
     }());
 
@@ -358,6 +362,11 @@ var app = (function () {
                 user ? btn.text("Cancel") : btn.text("Join!");
                 
                 btn.kendoTouch({ tap: function (e) { joinCancel() } });
+                $("body").kendoTouch({ enableSwipe: true, swipe: function (e) {
+                    if(e.direction === "right") {
+                        mobileApp.navigate('#:back');
+                    }
+                } });
             }
         };
     }());
@@ -432,4 +441,4 @@ var app = (function () {
             event: eventViewModel
         }
     };
-}());
+}());