fix merge with master
merge again?
fix merge again
merge merge!!!!

Merge commit '79072a2c8eb99e95e6434329d794a5abe2ea7592' into notifications

Conflicts:
	message/models.py
	project/_models/project.py
	project/_views/project.py
fix pip
move random_date to base.helpers
fix message migration exception
Merge branch 'notifications' of github.com:viewfuhrer/pro-atatat into notifications