cleanup
add OSGi
compile with IntelliJ v14 & Android API 21