Merge branch 'Danielhe280-master'
Fixed build configuration
Reordering Imports in MainActivity to alphabetical order