vA0.2.1
Merge github.com:Timfloure/mrx.fnux.fr

Conflicts:
	app/uploaders/image_uploader.rb
	app/views/home/gallery.html.erb