updated makefile
updated about
fixed merge
added release build