story
Merge branch 'master' of https://github.com/aroduribe/iLife
Added all conference rooms to picker