Fix administrator includes phpcs
Fix phpcs in LDAP plugin
adding empty example.php in idna_convert
 #^ [#31389] TinyMCE 4.0.5 Update. Thanks George Wilson
(Fix #1428)
dropping swf
Merge remote-tracking branch 'upstream/master'
 + [#31774] Add the Framework DI Container to the CMS. Thanks Don
Gilbert
(Fix #1755)
PHPCS for tiny
Merge pull request #1847 from wilsonge/phpcs

PHPCS for tiny
Exempt Framework code from CMS PHPCS, delete non-production code from Joomla\DI
[#31009] Add a switch to turn mail sending on/off (Fix #1186)
Emoticons images missing
emoticons again
Merge branch 'master' into gsoc_com_services

Conflicts:
	administrator/components/com_config/models/forms/application.xml

Deleted file since 'models' no longer going to use