Updated CHANGELOG and version for release
Add erlang.mk

Problem with getting dependencies using erlang.mk
Merge remote-tracking branch 'origin/master'

Conflicts:
	Makefile