optimizations
Merge branch 'development' of https://github.com/DigohD/SE-Android into development