* Updated mobile menu * Removed .orig files from conflicting commits