Merging subproject support

Conflicts:

	lunchbox/leveldb/persistentMap.h