settings, maps,
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/appcompat_v7_19_0_1.xml
	App/src/main/java/com/example/umorning/activities/MainActivity.java
	uMorning.iml
settings, maps,