add
Merge branch '0808'

Conflicts:
	public/app/js/translation.js
finish Market Trends