updated make file for non-ssl.
fixed building on Linux.
Merge branch 'dev'