Ajout article Japan Expo 2014
Merge branch 'master' into production

Conflicts:
	app/views/pages/articles.html.erb
	app/views/pages/media.html.erb
prod japan expo 2014