Merge pull request #10 from AgileVentures/develop

Merging to staging
Merge pull request #21 from AgileVentures/develop

First CD to Staging
Merge pull request #26 from AgileVentures/develop

Merging content and Ace editor from Develop
Merge pull request #32 from AgileVentures/develop

Migrating changes from Develop to Staging server
commented out about page content
Merge pull request #33 from PeteBoucher/staging

commented out about page content, awaiting new content and developer profiles
stripped out about page feature
Merge pull request #34 from PeteBoucher/staging

stripped out about page feature
and the spec
Merge pull request #35 from PeteBoucher/staging

commented out the view spec for the removed page content
modified  illustrations
resolved conflicts with staging
Merge branch 'develop' of https://github.com/yggie/codealia into develop
Merge pull request #40 from tochman/develop

Develop??