diff --git a/js/public/app.js b/js/public/app.js
deleted file mode 100644
index afb8f16f5..000000000
--- a/js/public/app.js
+++ /dev/null
@@ -1,1242 +0,0 @@
-
-angular.module('markdown', [])
-	.provider('markdown', [function () {
-		var opts = {};
-		return {
-			config: function (newOpts) {
-				opts = newOpts;
-			},
-			$get: function () {
-				return new window.showdown.Converter(opts);
-			}
-		};
-	}])
-	.filter('markdown', ['markdown', function (markdown) {
-		return function (text) {
-			return markdown.makeHtml(text || '');
-		};
-	}]);
-
-var app = angular.module('Deck', [
-	'ngRoute',
-	'ngSanitize',
-	'ui.router',
-	'ui.select',
-	'as.sortable',
-	'mdMarkdownIt',
-	'ngAnimate'
-]);
-
-
-app.config(["$provide", "$routeProvider", "$interpolateProvider", "$httpProvider", "$urlRouterProvider", "$stateProvider", "$compileProvider", "markdownItConverterProvider", function ($provide, $routeProvider, $interpolateProvider, $httpProvider, $urlRouterProvider, $stateProvider, $compileProvider, markdownItConverterProvider) {
-    'use strict';
-    $httpProvider.defaults.headers.common.requesttoken = oc_requesttoken;
-
-    $compileProvider.debugInfoEnabled(true);
-
-    markdownItConverterProvider.config({
-        breaks: true,
-        linkify: true,
-        xhtmlOut: true
-    });
-    markdownItConverterProvider.use(markdownitLinkTarget);
-
-    $urlRouterProvider.otherwise("/");
-
-    $stateProvider
-        .state('list', {
-            url: "/",
-            templateUrl: "/boardlist.mainView.html",
-            controller: 'ListController'
-		})
-        .state('board', {
-            url: "/board/:boardId/:filter",
-            templateUrl: "/board.html",
-            controller: 'BoardController',
-            params: {
-                filter: { value: '', dynamic: true }
-            }
-        })
-        .state('board.detail', {
-            url: "/detail/",
-            reloadOnSearch : false,
-            views: {
-                "sidebarView": {
-                    templateUrl: "/board.sidebarView.html"
-				}
-            }
-		})
-        .state('board.card', {
-            url: "/card/:cardId",
-            views: {
-                "sidebarView": {
-                    templateUrl: "/card.sidebarView.html",
-                    controller: 'CardController'
-                }
-            }
-        });
-
-
-}]);
-app.run(["$document", "$rootScope", "$transitions", function ($document, $rootScope, $transitions) {
-    'use strict';
-    $document.click(function (event) {
-        $rootScope.$broadcast('documentClicked', event);
-    });
-    $transitions.onEnter({to: 'board.card'}, function ($state, $transition$) {
-        $rootScope.sidebar.show = true;
-    });
-    $transitions.onEnter({to: 'board.detail'}, function ($state, $transition$) {
-        $rootScope.sidebar.show = true;
-    });
-    $transitions.onEnter({to: 'board'}, function ($state) {
-        $rootScope.sidebar.show = false;
-    });
-    $transitions.onExit({from: 'board.card'}, function ($state) {
-        $rootScope.sidebar.show = false;
-    });
-    $transitions.onExit({from: 'board.detail'}, function ($state) {
-        $rootScope.sidebar.show = false;
-    });
-    $transitions.onEnter({to: 'board.archive'}, function ($state) {
-        //BoardController.loadArchived();
-    });
-
-    $('link[rel="shortcut icon"]').attr(
-        'href',
-        OC.filePath('deck', 'img', 'app-512.png')
-    );
-
-}]);
-
-app.controller('AppController', ["$scope", "$location", "$http", "$route", "$log", "$rootScope", "$stateParams", function ($scope, $location, $http, $route, $log, $rootScope, $stateParams) {
-    $rootScope.sidebar = {
-        show: false
-    };
-    $scope.sidebar = $rootScope.sidebar;
-    $scope.user = oc_current_user;
-}]);
-app.controller('BoardController', ["$rootScope", "$scope", "$stateParams", "StatusService", "BoardService", "StackService", "CardService", "LabelService", "$state", "$transitions", "$filter", function ($rootScope, $scope, $stateParams, StatusService, BoardService, StackService, CardService, LabelService, $state, $transitions, $filter) {
-
-	$scope.sidebar = $rootScope.sidebar;
-
-	$scope.id = $stateParams.boardId;
-	$scope.status = {
-		addCard: [],
-	};
-	$scope.newLabel = {};
-	$scope.status.boardtab = $stateParams.detailTab;
-
-	$scope.stackservice = StackService;
-	$scope.boardservice = BoardService;
-	$scope.cardservice = CardService;
-	$scope.statusservice = StatusService.getInstance();
-	$scope.labelservice = LabelService;
-	$scope.defaultColors = ['31CC7C', '317CCC', 'FF7A66', 'F1DB50', '7C31CC', 'CC317C', '3A3B3D', 'CACBCD'];
-
-	$scope.search = function (searchText) {
-		$scope.searchText = searchText;
-		$scope.refreshData();
-	};
-
-	$scope.board = BoardService.getCurrent();
-	StackService.clear(); //FIXME: Is this still needed?
-	$scope.statusservice.retainWaiting();
-	$scope.statusservice.retainWaiting();
-
-	// FIXME: ugly solution for archive
-	$scope.$state = $stateParams;
-	$scope.filter = $stateParams.filter;
-	$scope.$watch('$state.filter', function (name) {
-		$scope.filter = name;
-	});
-	$scope.switchFilter = function (filter) {
-		$state.go('.', {filter: filter}, {notify: false});
-		$scope.filter = filter;
-	};
-	$scope.$watch('filter', function (name) {
-		if (name === "archive") {
-			$scope.loadArchived();
-		} else {
-			$scope.loadDefault();
-		}
-	});
-
-
-	$scope.stacksData = StackService;
-	$scope.stacks = {};
-	$scope.$watch('stacksData', function (value) {
-		$scope.refreshData();
-	}, true);
-	$scope.refreshData = function () {
-		if ($scope.filter === "archive") {
-			$scope.filterData('-lastModified', $scope.searchText);
-		} else {
-			$scope.filterData('order', $scope.searchText);
-		}
-	};
-	$scope.checkCanEdit = function () {
-		return !$scope.archived;
-	};
-
-	// filter cards here, as ng-sortable will not work nicely with html-inline filters
-	$scope.filterData = function (order, text) {
-		if ($scope.stacks === undefined)
-			return;
-		angular.copy(StackService.getAll(), $scope.stacks);
-		angular.forEach($scope.stacks, function (value, key) {
-			var cards = $filter('cardSearchFilter')(value.cards, text);
-			cards = $filter('orderBy')(cards, order);
-			$scope.stacks[key].cards = cards;
-		});
-	};
-
-	$scope.loadDefault = function () {
-		StackService.fetchAll($scope.id).then(function (data) {
-			$scope.statusservice.releaseWaiting();
-		}, function (error) {
-			$scope.statusservice.setError('Error occured', error);
-		});
-	};
-
-	$scope.loadArchived = function () {
-		StackService.fetchArchived($scope.id).then(function (data) {
-			$scope.statusservice.releaseWaiting();
-		}, function (error) {
-			$scope.statusservice.setError('Error occured', error);
-		});
-	};
-
-	// Handle initial Loading
-	BoardService.fetchOne($scope.id).then(function (data) {
-		BoardService.getPermissions();
-		$scope.statusservice.releaseWaiting();
-	}, function (error) {
-		$scope.statusservice.setError('Error occured', error);
-	});
-
-	BoardService.searchUsers('%25');
-
-	$scope.searchForUser = function (search) {
-		if (search == "") {
-			search = "%25";
-		}
-		BoardService.searchUsers(search);
-	};
-
-	$scope.newStack = {'boardId': $scope.id};
-	$scope.newCard = {};
-
-	// Create a new Stack
-	$scope.createStack = function () {
-		StackService.create($scope.newStack).then(function (data) {
-			$scope.newStack.title = "";
-		});
-	};
-
-	$scope.createCard = function (stack, title) {
-		var newCard = {
-			'title': title,
-			'stackId': stack,
-			'type': 'plain'
-		};
-		CardService.create(newCard).then(function (data) {
-			$scope.stackservice.addCard(data);
-			$scope.newCard.title = "";
-		});
-	};
-
-	$scope.cardDelete = function (card) {
-		CardService.delete(card.id);
-		StackService.removeCard(card);
-	};
-	$scope.cardArchive = function (card) {
-		CardService.archive(card);
-		StackService.removeCard(card);
-	};
-	$scope.cardUnarchive = function (card) {
-		CardService.unarchive(card);
-		StackService.removeCard(card);
-	};
-
-	$scope.labelDelete = function (label) {
-		LabelService.delete(label.id);
-		// remove from board data
-		var i = BoardService.getCurrent().labels.indexOf(label);
-		BoardService.getCurrent().labels.splice(i, 1);
-		// TODO: remove from cards
-	};
-	$scope.labelCreate = function (label) {
-		label.boardId = $scope.id;
-		LabelService.create(label);
-		BoardService.getCurrent().labels.push(label);
-		$scope.status.createLabel = false;
-		$scope.newLabel = {};
-	};
-	$scope.labelUpdate = function (label) {
-		label.edit = false;
-		LabelService.update(label);
-	};
-
-	$scope.aclAdd = function (sharee) {
-		sharee.boardId = $scope.id;
-		BoardService.addAcl(sharee);
-		$scope.status.addSharee = null;
-	};
-	$scope.aclDelete = function (acl) {
-		BoardService.deleteAcl(acl);
-	};
-	$scope.aclUpdate = function (acl) {
-		BoardService.updateAcl(acl);
-	};
-
-
-	// settings for card sorting
-	$scope.sortOptions = {
-		itemMoved: function (event) {
-			event.source.itemScope.modelValue.status = event.dest.sortableScope.$parent.column;
-			var order = event.dest.index;
-			var card = event.source.itemScope.c;
-			var newStack = event.dest.sortableScope.$parent.s.id;
-			var oldStack = card.stackId;
-			card.stackId = newStack;
-			CardService.update(card);
-			CardService.reorder(card, order).then(function (data) {
-				StackService.addCard(card);
-				StackService.reorder(card, order);
-				StackService.removeCard({
-					id: card.id,
-					stackId: oldStack
-				});
-			});
-		},
-		orderChanged: function (event) {
-			var order = event.dest.index;
-			var card = event.source.itemScope.c;
-			var stack = event.dest.sortableScope.$parent.s.id;
-			CardService.reorder(card, order).then(function (data) {
-				StackService.reorder(card, order);
-				$scope.refreshData();
-			});
-		},
-		scrollableContainer: '#board',
-		containerPositioning: 'relative',
-		containment: '#board',
-		// auto scroll on drag
-		dragMove: function (itemPosition, containment, eventObj) {
-			if (eventObj) {
-				var container = $("#board");
-				var offset = container.offset();
-				var targetX = eventObj.pageX - (offset.left || container.scrollLeft());
-				var targetY = eventObj.pageY - (offset.top || container.scrollTop());
-				if (targetX < offset.left) {
-					container.scrollLeft(container.scrollLeft() - 50);
-				} else if (targetX > container.width()) {
-					container.scrollLeft(container.scrollLeft() + 50);
-				}
-				if (targetY < offset.top) {
-					container.scrollTop(container.scrollTop() - 50);
-				} else if (targetY > container.height()) {
-					container.scrollTop(container.scrollTop() + 50);
-				}
-			}
-		}
-	};
-
-}]);
-
-app.controller('CardController', ["$scope", "$rootScope", "$routeParams", "$location", "$stateParams", "BoardService", "CardService", "StackService", "StatusService", function ($scope, $rootScope, $routeParams, $location, $stateParams, BoardService, CardService, StackService, StatusService) {
-    $scope.sidebar = $rootScope.sidebar;
-    $scope.status = {};
-
-    $scope.cardservice = CardService;
-    $scope.cardId = $stateParams.cardId;
-
-    $scope.statusservice = StatusService.getInstance();
-    $scope.boardservice = BoardService;
-
-    $scope.statusservice.retainWaiting();
-
-    CardService.fetchOne($scope.cardId).then(function(data) {
-        $scope.statusservice.releaseWaiting();
-        $scope.archived = CardService.getCurrent().archived;
-    }, function(error) {
-    });
-
-    $scope.cardRenameShow = function() {
-        if($scope.archived || !BoardService.canEdit())
-            return false;
-        else {
-            $scope.status.cardRename=true;
-        }
-    };
-    $scope.cardEditDescriptionShow = function($event) {
-        var node = $event.target.nodeName;
-        console.log($event);
-        console.log(BoardService);
-        if($scope.card.archived || !$scope.boardservice.canEdit()) {
-            console.log(node);
-        } else {
-            console.log("edit");
-            $scope.status.cardEditDescription=true;
-        }
-        console.log($scope.status.canEditDescription);
-    };
-    // handle rename to update information on the board as well
-    $scope.cardRename = function(card) {
-        CardService.rename(card).then(function(data) {
-            StackService.updateCard(card);
-            $scope.status.renameCard = false;
-        });
-    };
-    $scope.cardUpdate = function(card) {
-        CardService.update(CardService.getCurrent()).then(function(data) {
-            $scope.status.cardEditDescription = false;
-            $('#card-description').find('.save-indicator').fadeIn(500).fadeOut(1000);
-        });
-    };
-
-    $scope.labelAssign = function(element, model) {
-        CardService.assignLabel($scope.cardId, element.id);
-        var card = CardService.getCurrent();
-        StackService.updateCard(card);
-    };
-    
-    $scope.labelRemove = function(element, model) {
-        CardService.removeLabel($scope.cardId, element.id)
-    }
-
-}]);
-
-app.controller('ListController', ["$scope", "$location", "$filter", "BoardService", "$element", function ($scope, $location, $filter, BoardService, $element) {
-    $scope.boards = [];
-    $scope.newBoard = {};
-    $scope.status = {};
-    $scope.colors = ['0082c9', '00c9c6','00c906', 'c92b00', 'F1DB50', '7C31CC', '3A3B3D', 'CACBCD'];
-    $scope.boardservice = BoardService;
-
-    // FIXME: not nice, but we want to load this only once
-    if($element.attr('id') === 'app-navigation') {
-        BoardService.fetchAll().then(function(data) {
-            $scope.filterData();
-        }, function (error) {
-            // TODO: show error when loading fails
-        });
-    }
-
-    $scope.filterData = function () {
-        angular.copy($scope.boardservice.getData(), $scope.boardservice.sorted);
-        $scope.boardservice.sorted = $filter('orderBy')($scope.boardservice.sorted, 'title');
-    };
-
-    $scope.selectColor = function(color) {
-        $scope.newBoard.color = color;
-    };
-
-    $scope.boardCreate = function() {
-        if(!$scope.newBoard.title || !$scope.newBoard.color) {
-            $scope.status.addBoard=false;
-            return;
-        }
-        BoardService.create($scope.newBoard)
-            .then(function (response) {
-                $scope.newBoard = {};
-                $scope.status.addBoard=false;
-                $scope.filterData();
-            }, function(error) {
-                $scope.status.createBoard = 'Unable to insert board: ' + error.message;
-            });
-    };
-
-    $scope.boardUpdate = function(board) {
-        BoardService.update(board).then(function(data) {
-            $scope.filterData();
-        });
-        board.status.edit = false;
-    };
-
-    $scope.boardDelete = function(board) {
-            BoardService.delete(board.id).then(function (data) {
-                $scope.filterData();
-            });
-    };
-
-}]);
-
-
-// usage | cardFilter({ member: 'admin'})
-
-app.filter('cardFilter', function() {
-    return function(cards, rules) {
-		var _result = {};
-		angular.forEach(cards, function(card){
-			var _card = card;
-			angular.some(rules, function(rule, condition) {
-				if(_card[rule]===condition) {
-					_result.push(_card);
-				}
-			});
-		});
-		return result;
-    };
-});
-app.filter('cardSearchFilter', function() {
-	return function(cards, searchString) {
-		var _result = {};
-		var rules = {
-			title: searchString,
-			//owner: searchString,
-		};
-		angular.forEach(cards, function(card){
-			var _card = card;
-			Object.keys(rules).some(function(rule) {
-				if(_card[rule].search(rules[rule])>=0) {
-					_result[_card.id] = _card;
-				}
-			});
-		});
-
-		return $.map(_result, function(value, index) {
-			return [value];
-		});
-	};
-});
-app.filter('iconWhiteFilter', function() {
-	return function (hex) {
-		// RGB2HLS by Garry Tan
-		// http://axonflux.com/handy-rgb-to-hsl-and-rgb-to-hsv-color-model-c
-		var result = /^([A-Fa-f\d]{2})([A-Fa-f\d]{2})([A-Fa-f\d]{2})$/i.exec(hex);
-		var color = result ? {
-			r: parseInt(result[1], 16),
-			g: parseInt(result[2], 16),
-			b: parseInt(result[3], 16)
-		} : null;
-		if(result !== null) {
-			var r = color.r/255;
-			var g = color.g/255;
-			var b = color.b/255;
-			var max = Math.max(r, g, b), min = Math.min(r, g, b);
-			var h, s, l = (max + min) / 2;
-
-			if(max == min){
-				h = s = 0; // achromatic
-			}else{
-				var d = max - min;
-				s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
-				switch(max){
-					case r: h = (g - b) / d + (g < b ? 6 : 0); break;
-					case g: h = (b - r) / d + 2; break;
-					case b: h = (r - g) / d + 4; break;
-				}
-				h /= 6;
-			}
-			// TODO: Maybe just darken/lighten the color
-			if(l<0.5) {
-				return "-white";
-			} else {
-				return "";
-			}
-			//var rgba = "rgba(" + color.r + "," + color.g + "," + color.b + ",0.7)";
-			//return rgba;
-		} else {
-			return "";
-		}
-
-	}
-});
-
-app.filter('lightenColorFilter', function() {
-	return function (hex) {
-		var result = /^([A-Fa-f\d]{2})([A-Fa-f\d]{2})([A-Fa-f\d]{2})$/i.exec(hex);
-		var color = result ? {
-			r: parseInt(result[1], 16),
-			g: parseInt(result[2], 16),
-			b: parseInt(result[3], 16)
-		} : null;
-		if (result !== null) {
-			return "rgba(" + color.r + "," + color.g + "," + color.b + ",0.7)";
-		} else {
-			return "#" + hex;
-		}
-	}
-});
-app.filter('orderObjectBy', function(){
-	return function(input, attribute) {
-		if (!angular.isObject(input)) return input;
-		var array = [];
-		for(var objectKey in input) {
-			array.push(input[objectKey]);
-		}
-
-		array.sort(function(a, b){
-			a = parseInt(a[attribute]);
-			b = parseInt(b[attribute]);
-			return a < b;
-		});
-		return array;
-	}
-});
-app.filter('relativeDateFilter', function() {
-	return function (timestamp) {
-		return OC.Util.relativeModifiedDate(timestamp*1000);
-	}
-});
-
-app.filter('textColorFilter', function() {
-	return function (hex) {
-		// RGB2HLS by Garry Tan
-		// http://axonflux.com/handy-rgb-to-hsl-and-rgb-to-hsv-color-model-c
-		var result = /^([A-Fa-f\d]{2})([A-Fa-f\d]{2})([A-Fa-f\d]{2})$/i.exec(hex);
-		var color = result ? {
-			r: parseInt(result[1], 16),
-			g: parseInt(result[2], 16),
-			b: parseInt(result[3], 16)
-		} : null;
-		if(result !== null) {
-			var r = color.r/255;
-			var g = color.g/255;
-			var b = color.b/255;
-			var max = Math.max(r, g, b), min = Math.min(r, g, b);
-			var h, s, l = (max + min) / 2;
-
-			if(max == min){
-				h = s = 0; // achromatic
-			}else{
-				var d = max - min;
-				s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
-				switch(max){
-					case r: h = (g - b) / d + (g < b ? 6 : 0); break;
-					case g: h = (b - r) / d + 2; break;
-					case b: h = (r - g) / d + 4; break;
-				}
-				h /= 6;
-			}
-			if(l<0.5) {
-				return "#ffffff";
-			} else {
-				return "#000000";
-			}
-		} else {
-			return "#000000";
-		}
-
-	}
-});
-
-// OwnCloud Click Handling
-// https://doc.owncloud.org/server/8.0/developer_manual/app/css.html
-app.directive('appNavigationEntryUtils', function () {
-    'use strict';
-    return {
-        restrict: 'C',
-        link: function (scope, elm) {
-
-            var menu = elm.siblings('.app-navigation-entry-menu');
-            var button = $(elm)
-                .find('.app-navigation-entry-utils-menu-button button');
-
-            button.click(function () {
-                menu.toggleClass('open');
-            });
-            scope.$on('documentClicked', function (scope, event) {
-                if (event.target !== button[0]) {
-                    menu.removeClass('open');
-                }
-            });
-        }
-    };
-});
-
-
-app.directive('appPopoverMenuUtils', function () {
-    'use strict';
-    return {
-        restrict: 'C',
-        link: function (scope, elm) {
-            var menu = elm.find('.popovermenu');
-            var button = elm.find('button');
-            button.click(function (e) {
-                menu.toggleClass('hidden');
-                if(!menu.hasClass('hidden')) {
-                    button.css('display','block');
-                } else {
-                    button.css('display','');
-                }
-				e.stopPropagation();
-			});
-            scope.$on('documentClicked', function (scope, event) {
-                if (event.target !== button) {
-                    menu.addClass('hidden');
-                }
-                button.css('display','');
-            });
-        }
-    };
-});
-
-
-app.directive('autofocusOnInsert', function () {
-    'use strict';
-    return function (scope, elm) {
-        elm.focus();
-    };
-});
-app.directive('avatar', function() {
-	'use strict';
-	return {
-		restrict: 'A',
-		scope: true,
-		link: function(scope, element, attr){
-			attr.$observe('displayname', function(value){
-				if(value!==undefined) {
-					$(element).avatar(value, 32);
-				}
-			});
-		}
-	};
-});
-// original idea from blockloop: http://stackoverflow.com/a/24090733
-app.directive('elastic', [
-	'$timeout',
-	function($timeout) {
-		return {
-			restrict: 'A',
-			link: function($scope, element) {
-				$scope.initialHeight = $scope.initialHeight || element[0].style.height;
-				var resize = function() {
-					element[0].style.height = $scope.initialHeight;
-					element[0].style.height = "" + element[0].scrollHeight + "px";
-				};
-				element.on("input change", resize);
-				$timeout(resize, 0);
-			}
-		};
-	}
-]);
-app.directive('search', ["$document", "$location", function ($document, $location) {
-	'use strict';
-
-	return {
-		restrict: 'E',
-		scope: {
-			'onSearch': '='
-		},
-		link: function (scope) {
-			var box = $('#searchbox');
-			box.val($location.search().search);
-
-			var doSearch = function() {
-				var value = box.val();
-				scope.$apply(function () {
-					scope.onSearch(value);
-				});
-			};
-
-			box.on('search keyup', function (event) {
-				if (event.type === 'search' || event.keyCode === 13 ) {
-					doSearch();
-				}
-			});
-
-		}
-	};
-}]);
-
-app.factory('ApiService', ["$http", "$q", function($http, $q){
-    var ApiService = function(http, endpoint) {
-        this.endpoint = endpoint;
-        this.baseUrl = OC.generateUrl('/apps/deck/' + endpoint);
-        this.http = http;
-        this.q = $q;
-        this.data = {};
-        this.id = null;
-        this.sorted = [];
-    };
-
-    ApiService.prototype.fetchAll = function(){
-        var deferred = $q.defer();
-        var self = this;
-        $http.get(this.baseUrl).then(function (response) {
-            var objects = response.data;
-            objects.forEach(function (obj) {
-                self.data[obj.id] = obj;
-            });
-            deferred.resolve(self.data);
-        }, function (error) {
-            deferred.reject('Fetching ' + self.endpoint + ' failed');
-        });
-        return deferred.promise;
-    };
-
-    ApiService.prototype.fetchOne = function (id) {
-
-        this.id = id;
-        var deferred = $q.defer();
-
-        if(id===undefined) {
-            return deferred.promise;
-        }
-
-        var self = this;
-        $http.get(this.baseUrl + '/' + id).then(function (response) {
-            data = response.data;
-            if(self.data[data.id]===undefined) {
-                self.data[data.id] = response.data;
-            }
-            $.each(response.data, function(key, value) {
-                self.data[data.id][key] = value;
-            });
-            deferred.resolve(response.data);
-
-        }, function (error) {
-            deferred.reject('Fetching ' + self.endpoint + ' failed');
-        });
-        return deferred.promise;
-    };
-
-    ApiService.prototype.create = function (entity) {
-        var deferred = $q.defer();
-        var self = this;
-        $http.post(this.baseUrl, entity).then(function (response) {
-            self.add(response.data);
-            deferred.resolve(response.data);
-        }, function (error) {
-            deferred.reject('Fetching' + self.endpoint + ' failed');
-        });
-        return deferred.promise;
-    };
-
-    ApiService.prototype.update = function (entity) {
-        var deferred = $q.defer();
-        var self = this;
-        $http.put(this.baseUrl + '/' + entity.id, entity).then(function (response) {
-            self.add(response.data);
-            deferred.resolve(response.data);
-        }, function (error) {
-            deferred.reject('Updating ' + self.endpoint + ' failed');
-        });
-        return deferred.promise;
-
-    };
-
-    ApiService.prototype.delete = function (id) {
-        var deferred = $q.defer();
-        var self = this;
-
-        $http.delete(this.baseUrl + '/' + id).then(function (response) {
-            self.remove(id);
-            deferred.resolve(response.data);
-
-        }, function (error) {
-            deferred.reject('Deleting ' + self.endpoint + ' failed');
-        });
-        return deferred.promise;
-
-    };
-    
-
-    // methods for managing data
-    ApiService.prototype.clear = function() {
-        this.data = {};
-    };
-    ApiService.prototype.add = function (entity) {
-        var element = this.data[entity.id];
-        if(element===undefined) {
-            this.data[entity.id] = entity;
-        } else {
-            Object.keys(entity).forEach(function (key) {
-                element[key] = entity[key];
-                if(element[key]!==null)
-                    element[key].status = {};
-            });
-        }
-    };
-    ApiService.prototype.remove = function(id) {
-        if (this.data[id] !== undefined) {
-            delete this.data[id];
-        }
-    };
-    ApiService.prototype.addAll = function (entities) {
-        var self = this;
-        angular.forEach(entities, function(entity) {
-            self.add(entity);
-        });
-    };
-
-    ApiService.prototype.getCurrent = function () {
-        return this.data[this.id];
-    };
-
-    ApiService.prototype.getData = function() {
-        return $.map(this.data, function(value, index) {
-            return [value];
-        });
-    };
-
-    ApiService.prototype.getAll = function () {
-        return this.data;
-    };
-
-    ApiService.prototype.getName = function() {
-        var funcNameRegex = /function (.{1,})\(/;
-        var results = (funcNameRegex).exec((this).constructor.toString());
-        return (results && results.length > 1) ? results[1] : "";
-    };
-
-    return ApiService;
-
-}]);
-
-app.factory('BoardService', ["ApiService", "$http", "$q", function(ApiService, $http, $q){
-    var BoardService = function($http, ep, $q) {
-        ApiService.call(this, $http, ep, $q);
-    };
-    BoardService.prototype = angular.copy(ApiService.prototype);
-
-    BoardService.prototype.searchUsers = function(search) {
-        var url = OC.generateUrl('/apps/deck/share/search/'+search);
-        var deferred = $q.defer();
-        var self = this;
-        $http.get(url).then(function (response) {
-
-            self.sharees = [];
-            // filter out everyone who is already in the share list
-            angular.forEach(response.data, function(item) {
-                var exists = false;
-                angular.forEach(self.getCurrent().acl, function(acl) {
-                    if (acl.participant === item.participant) {
-                        exists = true;
-                    }
-                });
-                if(!exists) {
-                    self.sharees.push(item);
-                }
-            });
-
-            deferred.resolve(response.data);
-        }, function (error) {
-            deferred.reject('Error while update ' + self.endpoint);
-        });
-        return deferred.promise;
-    };
-
-    BoardService.prototype.addAcl = function(acl) {
-        var board = this.getCurrent();
-        var deferred = $q.defer();
-        var self = this;
-        var _acl = acl;
-        $http.post(this.baseUrl + '/' + acl.boardId + '/acl', _acl).then(function (response) {
-            if(!board.acl) {
-                board.acl = {};
-            }
-            board.acl[response.data.id] = response.data;
-            deferred.resolve(response.data);
-        }, function (error) {
-            deferred.reject('Error creating ACL ' + _acl);
-        });
-        acl = null;
-        return deferred.promise;
-    };
-
-    BoardService.prototype.deleteAcl = function(acl) {
-        var board = this.getCurrent();
-        var deferred = $q.defer();
-        var self = this;
-        $http.delete(this.baseUrl + '/' + acl.boardId + '/acl/' + acl.id).then(function (response) {
-            delete board.acl[response.data.id];
-            deferred.resolve(response.data);
-        }, function (error) {
-            deferred.reject('Error deleting ACL ' + acl.id);
-        });
-        acl = null;
-        return deferred.promise;
-    };
-
-    BoardService.prototype.updateAcl = function(acl) {
-        var board = this.getCurrent();
-        var deferred = $q.defer();
-        var self = this;
-        var _acl = acl;
-        $http.put(this.baseUrl + '/' + acl.boardId + '/acl', _acl).then(function (response) {
-            board.acl[_acl.id] = response.data;
-            deferred.resolve(response.data);
-        }, function (error) {
-            deferred.reject('Error updating ACL ' + _acl);
-        });
-        acl = null;
-        return deferred.promise;
-    };
-
-    BoardService.prototype.getPermissions = function() {
-        var board = this.getCurrent();
-        var deferred = $q.defer();
-        $http.get(this.baseUrl + '/' + board.id + '/permissions').then(function (response) {
-            board.permissions = response.data;
-            console.log(board.permissions);
-            deferred.resolve(response.data);
-        }, function (error) {
-            deferred.reject('Error fetching board permissions ' + board);
-        });
-    };
-
-    BoardService.prototype.canRead = function() {
-        if(!this.getCurrent() || !this.getCurrent().permissions) {
-            return false;
-        }
-        return this.getCurrent().permissions['PERMISSION_READ'];
-    }
-
-    BoardService.prototype.canEdit = function() {
-        if(!this.getCurrent() || !this.getCurrent().permissions) {
-            return false;
-        }
-        return this.getCurrent().permissions['PERMISSION_EDIT'];
-    }
-
-    BoardService.prototype.canManage = function() {
-        if(!this.getCurrent() || !this.getCurrent().permissions) {
-            return false;
-        }
-        return this.getCurrent().permissions['PERMISSION_MANAGE'];
-    }
-
-    BoardService.prototype.canShare = function() {
-        if(!this.getCurrent() || !this.getCurrent().permissions) {
-            return false;
-        }
-        return this.getCurrent().permissions['PERMISSION_SHARE'];
-    }
-
-    service = new BoardService($http, 'boards', $q);
-    return service;
-    
-}]);
-app.factory('CardService', ["ApiService", "$http", "$q", function(ApiService, $http, $q){
-    var CardService = function($http, ep, $q) {
-        ApiService.call(this, $http, ep, $q);
-    };
-    CardService.prototype = angular.copy(ApiService.prototype);
-
-    CardService.prototype.reorder = function(card, order) {
-        var deferred = $q.defer();
-        var self = this;
-        $http.put(this.baseUrl + '/' + card.id + '/reorder', {cardId: card.id, order: order, stackId: card.stackId}).then(function (response) {
-            deferred.resolve(response.data);
-        }, function (error) {
-            deferred.reject('Error while update ' + self.endpoint);
-        });
-        return deferred.promise;
-    };
-
-    CardService.prototype.rename = function(card) {
-        var deferred = $q.defer();
-        var self = this;
-        $http.put(this.baseUrl + '/' + card.id + '/rename', {cardId: card.id, title: card.title}).then(function (response) {
-            self.data[card.id].title = card.title;
-            deferred.resolve(response.data);
-        }, function (error) {
-            deferred.reject('Error while renaming ' + self.endpoint);
-        });
-        return deferred.promise;
-    };
-
-    CardService.prototype.assignLabel = function(card, label) {
-        var url = this.baseUrl + '/' + card + '/label/' + label;
-        var deferred = $q.defer();
-        var self = this;
-        $http.post(url).then(function (response) {
-            deferred.resolve(response.data);
-        }, function (error) {
-            deferred.reject('Error while update ' + self.endpoint);
-        });
-        return deferred.promise;
-    };
-    CardService.prototype.removeLabel = function(card, label) {
-        var url = this.baseUrl + '/' + card + '/label/' + label;
-        var deferred = $q.defer();
-        var self = this;
-        $http.delete(url).then(function (response) {
-            deferred.resolve(response.data);
-        }, function (error) {
-            deferred.reject('Error while update ' + self.endpoint);
-        });
-        return deferred.promise;
-    };
-
-    CardService.prototype.archive = function (card) {
-        var deferred = $q.defer();
-        var self = this;
-        $http.put(this.baseUrl + '/' + card.id + '/archive', {}).then(function (response) {
-            deferred.resolve(response.data);
-        }, function (error) {
-            deferred.reject('Error while update ' + self.endpoint);
-        });
-        return deferred.promise;
-
-    };
-
-    CardService.prototype.unarchive = function (card) {
-        var deferred = $q.defer();
-        var self = this;
-        $http.put(this.baseUrl + '/' + card.id + '/unarchive', {}).then(function (response) {
-            deferred.resolve(response.data);
-        }, function (error) {
-            deferred.reject('Error while update ' + self.endpoint);
-        });
-        return deferred.promise;
-
-    };
-
-    service = new CardService($http, 'cards', $q);
-    return service;
-}]);
-app.factory('LabelService', ["ApiService", "$http", "$q", function(ApiService, $http, $q){
-    var LabelService = function($http, ep, $q) {
-        ApiService.call(this, $http, ep, $q);
-    };
-    LabelService.prototype = angular.copy(ApiService.prototype);
-    service = new LabelService($http, 'labels', $q);
-    return service;
-}]);
-app.factory('StackService', ["ApiService", "$http", "$q", function(ApiService, $http, $q){
-    var StackService = function($http, ep, $q) {
-        ApiService.call(this, $http, ep, $q);
-    };
-    StackService.prototype = angular.copy(ApiService.prototype);
-    StackService.prototype.fetchAll = function(boardId) {
-        var deferred = $q.defer();
-        var self=this;
-        $http.get(this.baseUrl +'/'+boardId).then(function (response) {
-            self.clear();
-            self.addAll(response.data);
-            deferred.resolve(self.data);
-        }, function (error) {
-            deferred.reject('Error while loading stacks');
-        });
-        return deferred.promise;
-    };
-
-    StackService.prototype.fetchArchived = function(boardId) {
-        var deferred = $q.defer();
-        var self=this;
-        $http.get(this.baseUrl +'/'+boardId+'/archived').then(function (response) {
-            self.clear();
-            self.addAll(response.data);
-            deferred.resolve(self.data);
-        }, function (error) {
-            deferred.reject('Error while loading stacks');
-        });
-        return deferred.promise;
-    };
-
-    StackService.prototype.addCard = function(entity) {
-        if(!this.data[entity.stackId].cards) {
-            this.data[entity.stackId].cards = [];
-        }
-        this.data[entity.stackId].cards.push(entity);
-    };
-
-    StackService.prototype.reorder = function(entity, order) {
-        // assign new order
-        for(var i=0, j=0;i<this.data[entity.stackId].cards.length;i++) {
-            if(this.data[entity.stackId].cards[i].id === entity.id) {
-                this.data[entity.stackId].cards[i].order = order;
-            }
-            if(j === order) {
-                j++;
-            }
-            if(this.data[entity.stackId].cards[i].id !== entity.id) {
-                this.data[entity.stackId].cards[i].order = j++;
-            }
-        }
-        // sort array by order
-        this.data[entity.stackId].cards.sort(function(a,b) {
-            if (a.order < b.order)
-                return -1;
-            if (a.order > b.order)
-                return 1;
-            return 0;
-        });
-    };
-
-    StackService.prototype.updateCard = function(entity) {
-        var self = this;
-        var cards = this.data[entity.stackId].cards;
-        for(var i=0;i<cards.length;i++) {
-            if(cards[i].id == entity.id) {
-                cards[i] = entity;
-            }
-        }
-    };
-    StackService.prototype.removeCard = function(entity) {
-        var self = this;
-        var cards = this.data[entity.stackId].cards;
-        for(var i=0;i<cards.length;i++) {
-            if(cards[i].id == entity.id) {
-                cards.splice(i, 1);
-            }
-        }
-    };
-    
-    service = new StackService($http, 'stacks', $q);
-    return service;
-}]);
-
-
-app.factory('StatusService', function(){
-    // Status Helper
-    var StatusService = function() {
-        this.active = true;
-        this.icon = 'loading';
-        this.title = '';
-        this.text = '';
-        this.counter = 0;
-    };
-
-
-    StatusService.prototype.setStatus = function($icon, $title, $text) {
-        this.active = true;
-        this.icon = $icon;
-        this.title = $title;
-        this.text = $text;
-    };
-
-    StatusService.prototype.setError = function($title, $text) {
-        this.active = true;
-        this.icon = 'error';
-        this.title = $title;
-        this.text = $text;
-        this.counter = 0;
-    };
-
-    StatusService.prototype.releaseWaiting = function() {
-        if(this.counter>0)
-            this.counter--;
-        if(this.counter<=0) {
-            this.active = false;
-            this.counter = 0;
-        }
-    };
-
-    StatusService.prototype.retainWaiting = function() {
-        this.active = true;
-        this.icon = 'loading';
-        this.title = '';
-        this.text = '';
-        this.counter++;
-    };
-
-    StatusService.prototype.unsetStatus = function() {
-        this.active = false;
-    };
-
-    return {
-        getInstance: function() {
-            return new StatusService();
-        }
-    }
-
-});
-
-
-