update
Merge branch 'master' of https://github.com/tonysh518/bank_wall

Conflicts:
	static/js/lp.base.js