1) Renamed log4j.properties as log4j.properties.template so that openpnp
will properly use log4j.properties in user.home folder even if
openpnp-gui.jar is used by other artifacts. Without this change, the
log4j.properties used for defaulting is in the classpath, with disables
the user.home initialization.
2) Changed Main so that the slf4j intialization via LoggerFactory in Main
happens AFTER log4j.properties has been properly defaulted on startup.
Reconfigured IntelliJ IDEA auto-formatting to match openpnp coding
standards. Specifically, use tabs.

Jason, if you notice any other anomalies, let me know. Eclipse and
IDEA probably have different default coding styles.
Merge branch 'develop' of https://github.com/openpnp/openpnp into develop

Conflicts:
	gui/src/main/java/org/openpnp/Main.java (just took Jason's fix)
Logging for Reference... objects
Added comments to log4j.properties
Update Main.java

Restore from upstream
Merge branch 'develop' of https://github.com/firepick1/openpnp into firepick1-develop

# By Karl Lew (3) and firepick1 (1)
# Via Karl Lew (1) and firepick1 (1)
* 'develop' of https://github.com/firepick1/openpnp:
  Update Main.java
  Logging for Reference... objects Added comments to log4j.properties
  Reconfigured IntelliJ IDEA auto-formatting to match openpnp coding standards. Specifically, use tabs.
  1) Renamed log4j.properties as log4j.properties.template so that openpnp will properly use log4j.properties in user.home folder even if openpnp-gui.jar is used by other artifacts. Without this change, the log4j.properties used for defaulting is in the classpath, with disables the user.home initialization. 2) Changed Main so that the slf4j intialization via LoggerFactory in Main happens AFTER log4j.properties has been properly defaulted on startup.

Jason's modifications:
Removed logging from simple properties.