...
Merge branch 'Sheena' of https://github.com/bianxie/MAJ_2013 into Sheena

Conflicts:
	ProfileAppView/ProfileAppView/AppDelegate.m