reorganize import, and rename some Python reserved key words in lattice.views.py
Merge branch 'master' of ssh://github.com/UnitConversion/unitConversion

Conflicts:
	physics_dev/physics_django/lattice/views.py