Merge branch 'controller' into mauricio
Action image key changes
temporary image keys
Got rid of warnings
Fixed Image Keys and Controllers calling them bugs
Warnings removed
Merge branch 'controller' into mauricio
Merge branch 'mauricio' into controller