Added resize image function
Merge branch 'master' of github.com:ansermak/jukovina

Conflicts:
	app/models.py
	app/views.py