1.6

1.6
Merge branch 'master' of https://github.com/hungerr/tour

Conflicts:
	line/views.py
	mydata.db