fixed a few Java/Android warnings regarding generic types
Merge branch 'develop' into favorites