Change encrypt + decrypt function calls

Trying to link to crypto class
Merge remote-tracking branch 'origin/master'

Conflicts:
	cli/src/Control.cpp