Merge branch 'shalin' into kevin

Conflicts:
youparty/youparty/Base.lproj/Main.storyboard