Node entities draft
Merge remote-tracking branch 'upstream/master' into userprofile
close #137
close #137
Merge pull request #141 from easy-es/button-connexion

close #137
Restructure some web files
Merge remote-tracking branch 'upstream/master' into assetics

Conflicts:
	src/core/Claroline/CoreBundle/Migrations/Version20120119000000.php
Responsive iframes on the homepage
Delete entities from another branch
Delete entities from another branch
Merge pull request #143 from purplefish32/responsiveiframes

[WIP] Responsive iframes on the homepage
Merge pull request #144 from solispauwels/assetics

Restructure some web files :D
Merge branch 'master' into open_badge

Conflicts:
	.gitignore