131120 --session_key iOS problem
Merge remote-tracking branch 'origin/master'