Commented code and renamed various variables and methods in order to better conform to standard naming conventions and improve code readability.
Merge branch 'master' of https://github.com/rodys009/mhcs

Conflicts:
	src/edu/umn/d/grenoble/mhcs/Mars_Habitat_Configuration_System.gwt.xml
	src/edu/umn/d/grenoble/mhcs/client/MarsHabitatConfigurationSystem.java
	src/edu/umn/d/grenoble/mhcs/modules/Area.java
	src/edu/umn/d/grenoble/mhcs/modules/Module.java
	src/edu/umn/d/grenoble/mhcs/modules/Type.java
	war/WEB-INF/classes/edu/umn/d/grenoble/mhcs/Mars_Habitat_Configuration_System.gwt.xml
Fixed merge'd naming conflicts