Merge remote-tracking branch 'origin/dev' to test merging.
Merge branch 'dev' to again test merging.
Added necessary Android project files
Merge branch 'master' of https://github.com/marcjmcdougall/perspective