Fixed default admin config bug
Submodule update
Updated travis config
Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into refactoring-for-unit-tests
Merge branch 'refactoring-for-unit-tests' of https://github.com/claroline/Claroline into travis-integration
Fixed parameters.yml path
Added postgres to travis config
Merge pull request #103 from claroline/travis-integration

Travis integration
Merge branch 'refactoring-for-unit-tests'
Changed ant job config
Merge pull request #104 from claroline/master-bug-fixes

Master bug fixes
Removed plugins/fixtures from install (closes #34)
Fixed typo
Fixing workspace import/export.
Fixing resource rights editions for the root.
Merge branch 'master' of https://github.com/claroline/Claroline into refactoring-for-unit-tests

Conflicts:
	src/plugin/Claroline/RssReaderBundle