Thurion faction, systems, worlds (landable) added - nebula up to 8 jumps added with new damage adjustments - added secret jump system for New Haven - added Project Thurion systems and worlds (not landable)
Merge branch 'master' of git://github.com/bobbens/naev
Merge branch 'master' of git://github.com/bobbens/naev
New Thurion ship, added shipyards to Thurion shipyard stations- requires build that supports nebula damage resist
Merge branch 'master' of git://github.com/bobbens/naev
fixed nebula damage stat and minor balance tweaks to the ship
updates to precense and damage in the nebula
Merge branch 'master' of git://github.com/bobbens/naev
Merge branch 'master' of git://github.com/Deiz/naev
Merge branch 'master' of git://github.com/bobbens/naev
nebula stuff
ignoring stuff
Merge branch 'master' of git://github.com/bobbens/naev
fixed typo ... stupid british english
Merge branch 'master' of git://github.com/bobbens/naev
Mergin stuff apparently...
Fixed massive merge conflicts.
* Removed old, obsolete jumps.
Merge branch 'master' into thurion2

Conflicts:
	dat/ship.xml
	dat/ssys.xml
	dat/tech.xml

merged master and fixed conflicts
added lua file for thurion