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

Conflicts:

adv2014/adv2014.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdat
ad/UserInterfaceState.xcuserstate
nothing