upgrade rails to 3.2.12 && and json to 1.7.7
update JAX distribution centre url
add history to production goals grid
Re-generate assets
Merge remote-tracking branch 'origin/master' into targ_rep_combined

Conflicts:
	Gemfile.lock
	public/assets/extjs_autodep.js
phenotype_attempt submit button id