update gitignore
debugging retina and imageviewer
merged with develop