Added Cancel button

cancel does not work properly, text field covered by keyboard
Merge branch 'Andrew' into tear
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
Merge branch 'tear' into Bianca