Node entities draft
Merge remote-tracking branch 'upstream/master' into userprofile
Restructure some web files
Merge remote-tracking branch 'upstream/master' into assetics

Conflicts:
	src/core/Claroline/CoreBundle/Migrations/Version20120119000000.php
Delete entities from another branch
Delete entities from another branch
Merge pull request #144 from solispauwels/assetics

Restructure some web files :D