Resync from google code
Merge branch 'sync'

Conflicts:
	BART.wdgt/Script/Fare.js