Merge pull request #15 from MorganDawe/7.x

7.x
Merge pull request #16 from MorganDawe/7.x

7.x-fixs for ticket CWRCWriter/SharedCanvas Dedupe Part 2 (1970)
Fixed issue in chrome preventing an image annotation from showing upon first creation.
QA Bug fixes.
Fixed the stroke width not being implemented in the image annotation configuration.
removed a shared css resource from include common css, and moved it into the image annotation view call, as it is no longer a shared dependancy.
Fixed the stroke width not returning saved values.
Remove commented-out statement
Remove a few more commented-out alerts
Merge pull request #6 from mitchmac/7.x

Remove a few commented-out lines
Merge pull request #19 from MorganDawe/7.x.QA_bug_fixes

7.x.qa bug fixes
Fixed merge conflicts