removed icon files from repo
commit to allow merge
merge conflist fixed'
commit menu fix
commented michaels files
Merge with file fix etc