Moar Changes?
Merge branch 'tear' of https://github.com/bianxie/MAJ_2013 into tear

Conflicts:

MAJ_2013/MultiViewApplication/MultiViewApplication/MoodSlideViewControll
er.h

MAJ_2013/MultiViewApplication/MultiViewApplication/MoodSlideViewControll
er.m