final image size changes
conflict resolution
Fixed bug 1886
Updated app/views/citations/edit/.html.erb
Updated app/views/citations/show/html.erb
Checking in the generated version of treatments_controller_spec with
some minimal changes to get all tests to pass.  This is mainly a way
of starting to learn how to write controller specs.
Checking in generated version of treatments_controller_spec for reference.
On new and edit traits and yields forms, set default dateloc value to "No data".
On new and edit traits forms, set default timeloc value to "No data".
Updated calls to form_for helper with non-deprecated syntax.
Replaced deprecated has_and_belongs_to_many associations with "has_many through" style associations.
Used a more regular name in the has_many associations involving the pfts table.
Added a test for Redmine bug #1921.
Fixed Redmine bug #1921.
Create gh-pages branch via GitHub
Merge branch 'gh-pages' of github.com:PecanProject/bety
When attaching the handler to the select element, restrict it by name
to 'DataTables_Table_0_length' so that it doesn't get triggered by the
select dropdowns on the traits and yields pages that update the values
for QA/QC and Access level.

This fixes Redmine issue #1947.
Unset the id attribute for the select element having name
"DataTables_Table_0_length".  "DataTables_Table_0_length" is already
used as the id of the smallest containing div.
Added guest-login button to home page and modified the layout.
Moved login form back into the left column and tweaked layout via style-sheets.
Turning off rendering of user info via json and xml apis.