removed blender_addon folder (moved to separate git repository https://github.com/michalmielczynski/RayPump-Addon)
merge conflict fixed
Merge branch '1.0' of github.com:michalmielczynski/RayPump into 1.0