Fixed small conflict and fixed compiler warnings about signed-unsigned
comparison when compiling in debug mode.

Conflicts:
	src/fvm_cell.hpp