Merge commit 'release-2011' into develop
set pg to be installed in prod
updated Gemfile and gitignore
backing up
Changes to View & CSS. Fit the header image
ignoring tmp folder
removed the pid file
Merge branch 'feature/trail' into feature/trial
Added the staging environment
Merge branch 'feature/trial' of github.com:dictyBase/dictyconference into feature/trial
Homepage modifications
Changed source in Gemfile
Disabled abstract submission
Disabled registration
Changed transport details
Disabled user login
Disabled registration
Modifying registration (again)
Updated README
Uncommenting original source