A lot of changes for Neoxx Edition
more linsk changed
update
Java to 1.7
merge