added favicon
changed gitignore
Merge branch 'devel'