Added a basic map to the main activity. Updated the manifest and build files.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/mobile/com/mobileproject/MainActivity.java
	app/src/main/res/layout/activity_main.xml
Merge remote-tracking branch 'origin/master'
Added a basic map to the main activity. Updated the manifest and build files.