Merge remote-tracking branch 'origin/ParkingReminderModifiedMeterData'

Conflicts:

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

ParkingReminder01/src/main/java/com/justin/parkingreminder01/SetupFragme
nt.java
da

dsad