Sybil's updated files
Merge remote-tracking branch 'origin/master'

Conflicts:

	ParkingProject/app/src/main/java/com/sabooneparkingproject/parkingproject/MainActivity.java
	ParkingProject/app/src/main/res/layout/activity_main.xml