Support for image resizer service
Added support for image sizes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	build/js/timeline.js

Merged upstream (dans) latest changes.
Updated this.reload to take static data source and not a function.