Merge branch 'develop'
Merge branch 'develop'
fixed a bug in the index file
upgraded doctrine and app module