Set institution id in session with new code
Merge branch 'development' into stage
Merge branch 'stage'