Merge branch 'master' of https://github.com/mkastelik/Rosarium

Conflicts:
Rosarium/Intencja.h
Merge branch 'master' of https://github.com/mkastelik/Rosarium