updated from the branch
addded flag icons
deleted cache files
.gitignore modified
fixed conflicts