Changes

Summary

1. port in everything from 1.6 but labotimizetools(will do that later this (details)

Commit 109563f92614779a573710c5cb508c1404d3d805 by progwml6 port in everything from 1.6 but labotimizetools(will do that later this weekend)
	neptunessrgconverter.py
	methods.csv
	fields.csv