Merge pull request #273 from penguinho/master

Auto-populating activities from AndroidManifest