fix conflicts from merge with master.
treebd83b351a0c46d65d2ffc3ed7f37994f6b0b9e67
-rw-r--r-- 510 .gitignore
-rw-r--r-- 8797 Build.PL
drwxr-xr-x - R
-rw-r--r-- 128 README.md
drwxr-xr-x - R_files
drwxr-xr-x - bin
drwxr-xr-x - cgi-bin
-rw-r--r-- 165 changes
drwxr-xr-x - conf
drwxr-xr-x - db
lrwxrwxrwx 17 documents -> static/documents/
drwxr-xr-x - features
drwxr-xr-x - forms
drwxr-xr-x - inc
drwxr-xr-x - js
drwxr-xr-x - lib
drwxr-xr-x - mason
drwxr-xr-x - programs
-rwxr-xr-x 1297 run_cassava_production_server.sh
drwxr-xr-x - selenium
-rw-r--r-- 8385 sgn.conf
-rw-r--r-- 854 sgn_fixture_template.conf
drwxr-xr-x - static
drwxr-xr-x - support_data
drwxr-xr-x - t