Merge branch 'feature_account_creation' into develop
Added DS_Store
Updated Composer.phar
1) Updated composer.phar
2) Converted line delimiter from DOS/Windows to Unix
updated bower installation script
.gitignore updated
Updated build.xml to exclude src/vendor directory
Merge remote-tracking branch 'origin/develop' into develop
doctrine module configuration
doctrine module configuration
database configuration
doctrine module configuration
doctrine module configuration
doctrine module configuration
Merge branch 'develop' of https://github.com/cocoonprojects/ora into develop
doctrine modules activation
#FIX FOR: stdin: is not a tty
Converted AGAIN line delimiter from Windows to Unix
updated local.php.dist
Merge branch 'develop' of https://github.com/cocoonprojects/ora into develop