conflict resolution
conflict resolution
Change icons from the main page, fix aspect ration in case of resizing
Merge branch 'dev-V1.5' of https://github.com/kpetouk/appsgate-client into dev-V1.5