translate the remaining java classes to groovy
increment api to 21 (lollipop)
fix static analyser errors/warnings