track adjusted
Merge remote-tracking branch 'origin/new_origin' into new_origin

Conflicts:
	HSA/src/com/hsa/handler/TrackHandler.java