activity change col
Merge branch 'master' of https://github.com/varoon-fang/lanna_arch

Conflicts:
	pages/activity-Detail.html