added settings e2e test / added whitespace to emoji converter regexp / added some less to menu
Merged 'dev'.
Finish conversation-controls