test file writing
Merge remote-tracking branch 'origin/master'

Conflicts:
	datamng/models.pyc
	datamng/views.pyc