Merge remote-tracking branch 'origin/master'

Conflicts:
	App/src/main/AndroidManifest.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	App/src/main/java/com/example/umorning/AccountManagerActivity.java
	App/src/main/java/com/example/umorning/GoogleTraffic.java
	App/src/main/java/com/example/umorning/MainActivity.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	App/src/main/AndroidManifest.xml