adjust image on resize
Merge branch 'master' into adaptive_image_and_background

Conflicts:
	media/js/global.js
Merge pull request #9 from rachit-mittal/adaptive_image_and_background

adjust image on resize