WIP
Merge branch 'master' of github.com:alvise72/AndroStack