ignore tmp dir
Merge branch 'devel'