tree droid
Merge remote-tracking branch 'origin/master'

Conflicts:
	iDroid.cpp
Merge branch 'master' of https://github.com/FirasJ/Wet1