Revert "Remove version from the AndroidManifest.xml"

This reverts commit bbbe3f51c438512b2b581d2aa852fe4c6bfaedf6.
Revert "updated for android 21"

This reverts commit 774e7c0f69db3bd2b2fdc68e8fa5b583112fe51f.
Add back Dan's Intent changes and app/build.gradle fixes