Merge remote-tracking branch 'origin/master'

Conflicts:
Receiver handler
merged
Not to be pushed
Update git ignore
Update git ignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
updated receiver folder