final image size changes
conflict resolution
Fixed bug 1886
Updated app/views/citations/edit/.html.erb
Updated app/views/citations/show/html.erb
Turning off rendering of user info via json and xml apis.
Fixed typo.
Revert "Turning off rendering of user info via json and xml apis."

This reverts commit 61c70591e18e6f951d4caaa3ebcb90ee848cd5a8.
Added filtering out of user information to overrides.
Modified site and species models to output fewer attributes when
format is csv, xml, or json.

This essentially incorporates (and takes the place of) changes in
redmine pull request #35 ("added notes to limit fields returned via
API requsts to species and site").
cleanup inputs/dbfiles

remove unused file_id (redmine #1519)
better listing/editing of dbfiles
better list of inputs
more cleanup of inputs (redmine #1875)
more cleanup

move files/runs/variables to top to be consistent
fix show/back button to NOT submit form
Added updated willow results
Update willow_yield_grid.csv
Update willow_yield_grid.csv
updated willow maps
updated willow maps
Merge branch 'master' of github.com:PecanProject/bety

Conflicts:
	local/modelout/willow_yield_grid.png-legend.png
Merge branch 'bug1886-_2' of github.com:robbenyang/bety into robenyang-bug1886-_2