image_size_type model added, minor changes to GalleryImages#_form
Merge branch 'master' of https://github.com/micage/eve into micas

Conflicts:
	app/views/gallery_images/index.html.erb
no message
Merge branch 'master' of https://github.com/micage/eve into micas
Merge branch 'master' of https://github.com/micage/eve into micas

Conflicts:
	app/views/gallery_images/index.html.erb
convert option changes in GalleryImage model
Merge branch 'micas' of https://github.com/micage/eve into micas

Conflicts:
	app/models/gallery_image.rb
	app/views/gallery_images/_form.html.erb
	app/views/gallery_images/admin.html.erb
	db/schema.rb
Merge branch 'master' of https://github.com/micage/eve into micas

Conflicts:
	app/models/gallery_image.rb
	app/views/gallery_images/admin.html.erb
	db/schema.rb
double height style added
thumb is displayed 32x32
Merge branch 'micas' of https://github.com/micage/eve into micas
image types added: double width, double height
corrected hd image option