add
Merge branch '1125'

Conflicts:
	public/app/js/model.js
change chart formater name