Added License to source code
Readied code for release with Android Studio
Fixed merge conflicts