Fixed sniffing of extension, gets tricked by filenames with periods in it.
Added underscores and dashes as allowed UID characters
Removed console logging
IMG-607 Switch to lazy image loading
Merge remote-tracking branch 'origin/develop' into develop