Added citation author and citation year to the list of columns that
the advanced search will attempt to match on.  Modified the
AdvancedSearch module to treat textual and non-textual columns
differently.  This addresses most of the feature request in Redmine
issue #2333.
Fixed site integration test (resolves Redmine issue #1752).

Author:    MarvinJ <hjiang13@illinois.edu>
Merge branch 'MarvinJ-change_test'
Restyling of feedback tab, including auto-hiding.  Related to Redmine issues #2307 and #2306.

[Author:    yln <sourgrapes612@hotmail.com>]
Added whitespace for readability only.
Merge branch 'phenolphtalein-feedback'
remove link to sites
fix_link
Merge pull request #105 from phenolphtalein/remove_sites_link

Remove the "Sites>>" button on the listing traits page, resolving Redmine issue #2241.
Allow non-administrative users to see and edit their own user page.  Fixes Redmine issue #2186.
Merge branch 'MarvinJ-user_test'
Combines statistics columns on traits and yields pages into one column (Redmine issue #2300).
Merge branch 'phenolphtalein-combine_stats'
Fixed workflows renaming issue (Redmine issue #2337) and added rspec test to verify fix.
Merge branch 'MarvinJ-run_test'
Merge pull request #107 from MarvinJ/task2299

Fixed redmine issue #2299.
Merge branch 'master' into RM-1694-geometry-column