further development do spice, alguns tweaks no crm
Merge origin/master