Fixed conflicts from merge.
Merge pull request #153 from vreixo/issue149

Fixed conflicts from merge.
Fix #145 - Migrate to Gradle and Android Studio.
Merge pull request #155 from CUTR-at-USF/issue145-gradle

Fix #145 - Migrate to Gradle and Android Studio.
Fix #157 - Add code style guide and template, and re-format code.
Merge pull request #158 from CUTR-at-USF/issue157-CodeStyle

Fix #157 - Add code style guide and template, and re-format code.