Merge branch 'chalo-beta' into myanmar
myanmar specific config
incorrectly applied patch. not setting opacity
Merge branch 'colour_control' into chalo-beta
Merge branch 'chalo-beta' into laos
Merge branch 'chalo-beta' into myanmar
server management and stuff
spurious file
lists of deployements and servers
Merge branch 'chalo-beta' into laos

Conflicts:
	src/client/js/otp/config.js
trying to stop coflicts on config.js
Merge branch 'chalo-beta' into laos

Conflicts:
	src/client/js/otp/config.js
ilost the git checkouut
Merge branch 'admin_scripts' into chalo-beta
Merge branch 'chalo-beta' into laos
list of scripts
Merge branch 'admin_scripts' into chalo-beta
Merge branch 'chalo-beta' into laos
switching to wikitimetable