added propel and removed doctorine
updated dependencies
updated dependencies
corrected build.xml
Merge branch 'add-propel' into develop