iml
Merge remote-tracking branch 'origin/master'

Conflicts:
	BikeApp-2.iml
devices related to serviceOrder are now saved. added redirect to update page