Merge branch 'hotfix/CVE-2013-4457' into develop
Merge branch 'hotfix/SecurityUpgrades' into develop
Merge branch 'hotfix/DeviseKey' into develop
up'ed cap dependecies
updating to cap3
Merge branch 'feature/CapUpgrade' into develop
Merge branch 'develop'