Conflicts:
	interface/web/themes/default/templates/main.tpl.htm

add missing translation for email_forward email_error_isemail

See merge request !146

Master

See merge request !145

Develop

See merge request !1

Option Enable Spdy

checks if spdy is enabled on server configuration

See merge request !144

Add Spdy

Add Spdy option on SSL-tabs

See merge request !142

see:
- http://git.ispconfig.org/panders/ispconfig3/commit/f7ec00b2f8ba3efc5bdeacef9c813f8a826ae3be#note_455

see:
- http://git.ispconfig.org/panders/ispconfig3/commit/f7ec00b2f8ba3efc5bdeacef9c813f8a826ae3be#note_454

see:
- http://git.ispconfig.org/panders/ispconfig3/commit/f7ec00b2f8ba3efc5bdeacef9c813f8a826ae3be#note_453
- http://git.ispconfig.org/panders/ispconfig3/commit/f7ec00b2f8ba3efc5bdeacef9c813f8a826ae3be#note_452
- http://git.ispconfig.org/panders/ispconfig3/commit/f7ec00b2f8ba3efc5bdeacef9c813f8a826ae3be#note_450
- http://git.ispconfig.org/panders/ispconfig3/commit/f7ec00b2f8ba3efc5bdeacef9c813f8a826ae3be#note_449

see:
- http://git.ispconfig.org/panders/ispconfig3/commit/f7ec00b2f8ba3efc5bdeacef9c813f8a826ae3be#note_448

- http://en.wikipedia.org/wiki/SPDY

- Directive snippets can now be made available to clients; clients can select an available directive snippet for a website - the appropriate snippet will then be written to the vhost configuration file. This is useful for example on nginx where clients have no access to the Options tab of a website.

- Added HHVM to "Default PHP Handler" field (server configuration).
- Fixed "Unable to load the server configuration from database." error when running server.sh.
- Fixed Javascript (accordions weren't working anymore, directive snippets and other placeholders couldn't be added anymore).

Master

See merge request !138