updates
Merge remote-tracking branch 'github/master'

Conflicts:
	.idea/workspace.xml
	src/main/java/ParkSmart/AdminController.java
	src/main/java/ParkSmart/KioskController.java
	src/main/java/ParkSmart/MainApp.java
	src/main/java/ParkSmart/MapController.java
	src/main/java/ParkSmart/Model/User.java
to be worked on