Update on the project code
Merge branch 'develop' of git://github.com/debranova/project into develop