Added ELPH330 to camera list.
Updated from trunk.
Fixes for update from trunk.