Merge from Github
Merge branch 'master' of https://github.com/socialradar/Imigixor

Conflicts:
	.gitignore