kerosine-24 migrate werkt niet
Merge remote-tracking branch 'origin/master'

Conflicts:
	app1/migrations/0001_initial.py
Merge remote-tracking branch 'origin/master'
kerosine-27 create custom user model
kerosine-28 Tests no more dependent on fixtures.
Merge remote-tracking branch 'origin/master'