Completed encryption algorithm

And added disconnectFromDatabase() function
Merge remote-tracking branch 'origin/master'

Conflicts:
	api/DatabaseConnection.php
	api/cipherTest.php