Merge remote-tracking branch 'origin/masterExperimental' into masterCloneMultiple

Conflicts:

ParkingReminder01/src/main/java/com/justin/parkingreminder01/MeterNotify
Data.java

ParkingReminder01/src/main/java/com/justin/parkingreminder01/SetupFragme
nt.java
Merge branch 'master' into masterCloneMultiple

Conflicts:

ParkingReminder01/src/main/java/com/justin/parkingreminder01/MeterNotify
Data.java

ParkingReminder01/src/main/java/com/justin/parkingreminder01/SetupFragme
nt.java
commit to merge

commit to merge
Merge branch 'masterCloneMultiple'

Conflicts:

ParkingReminder01/src/main/java/com/justin/parkingreminder01/MeterNotify
Data.java