fixed issue
Merge branch 'master' into I70_rect_tool_color_change

Conflicts:
	Paintroid/src/org/catrobat/paintroid/tools/implementation/RectangleFillTool.java
Merge pull request #75 from Catrobat/I70_rect_tool_color_change

fixed issue
implemented: @galstc05 [SG]
acceptance: @mgerald [GM]