untested - added ActiveAndroid lib and Model annotations