issue_1
add ignores
issue 1 ok
issue 1 ok
Merge branches 'dev_1.1' and 'issue_1' into dev_1.1