further development do spice, couple bugs fixed no crm
Merge origin/master