fix conflict
Add new pixmap files for templates, homebank and gwhere
Merge branch 'testing' into latest