Added material design, Android Lollipop support, minor bug fixes