Pulled from remote repository
Fixed all merge conflicts
Reviewed Complete Explorer code