Merge origin/master

Conflicts:
	src/elmannetwork/DataSetElman.java
	src/elmannetwork/ElmanNetwork.java
	src/elmannetwork/Main.java