pre merge
Merge branch 'master' of https://github.com/JoshDaly/TrackM

Conflicts:
	trackm/view.py
froogled again !