Part of the dublicate code in edit and story views removed
Picture size selected in templates
JS cleanup
Merge branch 'master' of github.com:caujka/TripJournal

Conflicts:
	trip_journal_app/models.py
	trip_journal_app/static/javascript/create.js
	trip_journal_app/views.py
New python packages