Fix administrator includes phpcs
Fix phpcs in LDAP plugin
Merge remote-tracking branch 'upstream/master'
PHPCS for tiny
Merge pull request #1847 from wilsonge/phpcs

PHPCS for tiny
Merge Conflicts
Merge branch 'master' into gsoc_com_services

Conflicts:
	administrator/components/com_admin/sql/updates/mysql/3.2.0.sql
	administrator/components/com_admin/sql/updates/postgresql/3.2.0.sql
	administrator/components/com_admin/sql/updates/sqlazure/3.2.0.sql
	administrator/components/com_config/controllers/application.php
	administrator/components/com_config/models/component.php
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
solved conflicts in models
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
application form xml updated
Completing tinymce upgrade
Missing lang strings in installation
Another test
Merge pull request #1862 from wilsonge/jpaginationtets

Another test for JPagination
Code style
Merge pull request #1869 from piotr-cz/cs_JImage

CS: JImage