For review
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	source/tests/test_notification_pusher.py
For Reviewing