FreenetIS

refs #1135: lBilling, voip, voip sip deleted. All relations for this controllers and models deleted.

refs #1141: calendar is not displayed in the work reports

Fixes #1121: Fix slow loading of mapy.cz if Loader not fetched (e.g. slow connection or offline). The mapy.cz API is loaded asynchronously now. The map loading is waiting in a loop until it is loaded.

Fix #1113: Fix display of address point map in popup [develop]

Fixes #1105: map support fixes [develop]

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 :-).

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