merge master before new refaktoring sprint starts #69

Closed janpolowinski closed 10 years ago