namespaces etc
Merge ../GitHub/WebCola
ming's stuff
Merge ../../WebCola