working on resize
change
changes
Merge branch 'master' into dev_server

Conflicts:
	uploader/config.php