Merge pull request #35 from jahntheman/master

Added SoftCam.Key support
Merge pull request #36 from jahntheman/master

fixed some typos and updated patch instructions
Merge pull request #37 from jahntheman/master

rewrote Cryptoworks
Merge pull request #38 from jahntheman/master

fixed Via1
Merge pull request #40 from jahntheman/master

fixed 'RSA' name collision with openssl
Merge pull request #41 from jahntheman/master

fixed building with openssl
Merge pull request #42 from jahntheman/master

keys are now included at compile time with SoftCam.Key and are no longer...
Merge pull request #43 from jahntheman/master

updated todo info
Merge pull request #44 from jahntheman/master

made KeyDB faster
Merge pull request #45 from jahntheman/master

updated README
Merge pull request #46 from jahntheman/master

fixed Mac OSX build
Merge pull request #47 from jahntheman/master

fixed some issues with keyfile reading
Merge pull request #48 from jahntheman/master

fixed memory leak in SetKey() and a warning
Merge pull request #49 from jahntheman/master

fixed cw nano80 problem
Merge pull request #50 from jahntheman/master

fixed a warning
modified README
Merge branch 'master' of https://github.com/oscam-emu/oscam-emu

Conflicts:
	README