change watermark to icon, changed watermark menu item to Unit patch, completed unit patch functionality
Merge origin/development into development