Fix some bugs on DAOAndroid
Merge branch 'master' of git@gitlab.com:cowabunga-team/ar-cowabunga-project.git
Merge branch 'master' of git@gitlab.com:cowabunga-team/ar-cowabunga-project.git