Merged everything, added local notification, app design, images, icons