FreenetIS

Merge branch 'issue-1094_develop' into 'develop'

Fixes #1094: Allows to delete former member older than 5 years [develop].

See merge request freenetis/freenetis!43

Fixes #1094: Allows to delete former member older than 5 years.

Conflicts:
application/libraries/MY_Controller.php
application/models/bank_transfer.php

Refs #1076: member expiration date calculation fix. The calc functionality was separate from Members controller to a new Expiration calc service. The new service comes with unit tests which tests the #1076. Additionally this patch comes with some fixes and improvements in already existing unit and integration tests.

Ref #1068: add support connecting to encrypted SMTP servers.

refs #967: Removal of account type select box from add from account transfer form because this functionality is now handled by destination account filter

Fix merge issue that removed all staff from developer branch :-).

refs #1021: Fixes that destination account not shown in transfer detail if origin account empty

Undo my stupid mistake (I have pushed issue-957 to master instead of develop). Do I have copied files from GitHub master and push them back..

Merge branch 'develop' into issue-957

Conflicts:
application/controllers/members.php

refs #957: Rollback changes in showing date