Merge pull request #1 from fredladeroute/develop

Develop
Added NeuronType enum

The enum describes 3 neuron types; Hidden, Input or Output.
Made a few changes to Main.java
Fixed style issues.
Merge remote-tracking branch 'origin/develop'

Conflicts:
	core/src/main/java/com/neuralnetwork/core/Main.java
	shared/src/main/java/com/neuralnetwork/shared/nodes/AbstractInputNeuron.java
	shared/src/main/java/com/neuralnetwork/shared/nodes/Neuron.java
	shared/src/main/java/com/neuralnetwork/shared/util/NeuralNetBuilder.java
Fixed style issues.
Merge branch 'master' into develop