Merge remote-tracking branch 'origin/master'

Conflicts:
	dummy_data.py
	views.py