edited ticket submit page
Merge remote-tracking branch 'origin/master'

Conflicts:
	ParkingProject/app/app.iml