Merge branch 'hotfix/images'
bb icon resize
Merge branch 'hotfix/bbicon'
Merge branch 'hotfix/bbicon' into develop
edit conf
Merge branch 'hotfix/bbicon2'
Merge branch 'hotfix/bbicon2' into develop
Merge branch 'develop' of https://github.com/trojanspike/AA-finder into develop
Merge branch 'master' of https://github.com/trojanspike/AA-finder into develop
clean / reset soem data
Merge branch 'hotfix/clear' into develop