Feature/enhancement merge console module with webservices 349

Fixes #349