merge migrations
MAGRATION Décommenter des create_join_table dans les migations.

Merge branch 'master' of https://github.com/facenord-sud/collaide

Conflicts:
	db/migrate/20140122144614_create_table_advertisement.rb
	db/migrate/20140122144615_create_table_user.rb
	db/schema.rb