Merge pull request #162 from bbodenmiller/develop

merges iOS7 branch in to develop
Merge pull request #163 from bbodenmiller/develop

2.1 changelog additions
log checkpoint for api server
Merge pull request #164 from bbodenmiller/tf

log checkpoint for api server
Fix log api server
move checkpoint for api server to after session start