updating login_form
Merge branch 'master' of https://github.com/caujka/TripJournal

Conflicts:
	TripJournal/settings.py
	trip_journal_app/templates/index.html
	trip_journal_app/urls.py
	trip_journal_app/views.py
Merge branch 'master' of https://github.com/caujka/TripJournal
added login-logout function
Title and text of story displayed on edit page.
Merge branch 'master' of https://github.com/caujka/TripJournal into Auth
Add serching stories by coordinates
Added search by coordinates
Stoies page added
Merge branch 'master' into Auth

Conflicts:
	TripJournal/settings.py
	trip_journal_app/models.py
	trip_journal_app/templates/base.html
	trip_journal_app/templates/index.html
	trip_journal_app/urls.py
	trip_journal_app/views.py