hopefully removed stupid upgrade files
Merge branch 'qa' into development
looks like I did product pictures but i know I did past tast edit permission
fixed name of task menu item
fixed name of task menu item
updated cc
know idea what's in here, very bad form
Merge branch 'development' into qa