update gradle + removed files from git
Merge remote-tracking branch 'origin/master'

Conflicts:
	HumaDex.iml
update gradle + removed files from git
Merge remote-tracking branch 'origin/master'