add update
last
Merge branch 'master' of https://github.com/Shihsuang/DoBuyTower
final
Merge branch 'master' into SearchModule

Conflicts:
	scripts/app.js