Added /data/ for brent, moved world code.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main.cpp