[TACHYON-220] Refactoring of recursive code and use of Concurrent HashMap. addFile cleaned up.
Merge branch 'TACHYON-220' of https://github.com/devldevelopment/tachyon into TACHYON-220

Conflicts:
	core/src/main/java/tachyon/master/MasterInfo.java