server_201407180620

server_201407180620
server_commit

server_commit
Merge branch 'server2' into Camera&edit

Conflicts:

picmot.xcodeproj/project.xcworkspace/xcuserdata/miyoshihayato.xcuserdata
d/UserInterfaceState.xcuserstate