lot of refactoring
Merge branch 'master' of https://github.com/DigohD/SE-Android