added diffie-hellman parameters and server client conf files edited.
Merge branch 'develop'