Merge branch 'hotfix/0.6.8.3'
Merge branch 'release/0.6.9'
Update lock to latest copy of rails - 2.3.15
Upgrade Rails to version 2.3.16 to get fix for CVE-2013-0333.
Merge branch 'hotfix/0.6.9.2' into develop

Conflicts:
    Gemfile.lock