Fix style on Lollipop
Clean up project
ready to release