Merge branch 'zelgadis_master'. Resolved conflicts manually

diff --cc synfig-studio/images/Makefile.am
index 4c014ff,5711c72..46eb1e6
--- 1/synfig-studio/images/Makefile.am
--- 2/synfig-studio/images/Makefile.am
+++ b/synfig-studio/images/Makefile.am
@@@ -164,12 -178,29 +164,11 @@@ IMAGES = 
        sif_icon.$(EXT) \
        synfig_icon.$(EXT) \
        saveall_icon.$(EXT) \
 -      type_bool_icon.$(EXT) \
 -      type_integer_icon.$(EXT) \
 -      type_angle_icon.$(EXT) \
 -      type_segment_icon.$(EXT) \
 -      type_blinepoint_icon.$(EXT) \
 -      type_list_icon.$(EXT) \
 -      type_canvas_icon.$(EXT) \
 -      type_string_icon.$(EXT) \
 -      eyedrop_icon.$(EXT) \
        about_icon.$(EXT) \
-       splash_screen1.$(EXT) \
-       splash_screen2.$(EXT) \
+       splash_screen.$(EXT) \
 -      canvas_icon.$(EXT) \
 -      type_vector_icon.$(EXT) \
 -      type_real_icon.$(EXT) \
 -      type_color_icon.$(EXT) \
        valuenode_icon.$(EXT) \
 -      polygon_icon.$(EXT) \
 -      bline_icon.$(EXT) \
 -      layer_icon.$(EXT) \
        duplicate_icon.$(EXT) \
        encapsulate_icon.$(EXT) \
 -      gradient_icon.$(EXT) \
 -      type_gradient_icon.$(EXT) \
        keyframe_lock_all.$(EXT) \
        keyframe_lock_past.$(EXT) \
        keyframe_lock_future.$(EXT) \