Refactored demo fixture
Submodule update
Merge pull request #148 from kitan1982/rss-reader-bugs-fixes

Submodule update
Submodule update
Merge remote-tracking branch 'upstream/master'
Submodule update
Fixed weird netbeans bug
Merge pull request #149 from stefk/plugins-update

Plugins update
Merge pull request #150 from stefk/gitignore-fix

Fixed weird netbeans bug
Default Theme update
Merge pull request #151 from solispauwels/GUI

Default Theme update
Merge remote-tracking branch 'upstream/master' into restore-demo-fixtures
Fixed message fixture
Removed commented code and double quotes
Merge pull request #153 from stefk/restore-demo-fixtures

Restore demo fixtures
Reduced mockery tests memory footprint
Added partial mock support
Removed call to 5.4 only method
Merge pull request #155 from stefk/mockery-tests-memory

Reduced mockery tests memory footprint
Merge remote-tracking branch 'upstream/master' into import-users-from-csv-to-group

Conflicts:
	src/core/Claroline/CoreBundle/Tests/Manager/UserManagerTest.php