Added call to erlang.mk to build .app file
Merge