Andrew commit
Merge branch 'master' of https://github.com/bianxie/MAJ_2013

Conflicts:
	MAJApp/MAJApp.xcodeproj/project.pbxproj
	MAJApp/MAJApp/MainMenuViewController.m
	MAJApp/MAJApp/MainMenuViewController.xib
Latest