Merge branch 'david' of https://github.com/dxwang/remotecollab into aruth
blah
merge
Merge branch 'aruth' of github.com:dxwang/remotecollab into vithushan