Merge remote-tracking branch 'remotes/origin/omar'

Conflicts:
	.idea/misc.xml
	gradle/wrapper/gradle-wrapper.properties