Completed TrackCircuitAcitvity functionality
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/request_activity.xml
	res/layout/single_circuit_activity.xml
	res/values/strings.xml
Completed TrackCircuitAcitvity functionality