application Screenshot added
merge conflict fixed
application screenshot added
merged with develop