Merge pull request #288 from SUNY-Albany-CCI-INF362/just

Moved Settlement conference in stages drop down
Merge pull request #289 from SUNY-Albany-CCI-INF362/master

Merge pull request #288 from SUNY-Albany-CCI-INF362/just