merge photo collection
Merge branch 'chaolun' of https://github.com/SMIL/citybeat_online into chaolun
clean the project