Updated to latest android gradle plugin and latest build tools
Merge pull request #588 from TechFreak/gradle_build_tools_update

Updated to latest android gradle plugin and latest build tools
Merge branch 'master' into unstable
Merge pull request #589 from bhariharan/unstable

Merge branch 'master' into unstable