ready for v2.5.1 - android 5.0 support
ready for v2.5.1
Merge branch 'release/v2.5.1' into develop