j query cost calculation
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/assets/js/admin/sb-admin-2.js