SOAP-491 Fixed bug
SOAP-486 and SOAP-487 Added missing buttons to toolbar
merging parent branch