lable
Merge branch 'master' of https://github.com/TEDinTW/2014adv

Conflicts:
	adv2014/adv2014/en.lproj/MainStoryboard.storyboard