mapy+dodaj film
Merge branch 'master' of https://github.com/szwagier90/android_obd

Conflicts:
	project/android_obd/views.py
komit wszystko