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
test
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/config/autoload/local.php.dist
test
added simlink to gitignore
version blocked for behat
added behat.yml into tests/functional