More fixes to Documentation.
More fixes to Documentation.
Merge remote-tracking branch 'upstream/master' into feature-apidoc

Conflicts:
	includes/qcubed/_core/base_controls/QListBoxBase.class.php
retry at documentation
Merge branch 'feature-apidoc_vaibhav' of https://github.com/vaibhav-kaushal/qc-framework into feature-apidoc

Conflicts:
	includes/qcubed/controls/QAutocomplete.class.php

The ```?>``` file endings restored.
Merge pull request #164 from olegabr/feature-apidoc

Feature apidoc
jquery UI docs, again :(
jquery UI docs generator update
Merge pull request #171 from vaibhav-kaushal/feature-apidoc

Documentation of jQuery UI (generated) controls
Docs added
phpDocumentor2 config file to generate documentation
Merge branch 'feature-apidoc' of https://github.com/qcubed/framework into feature-apidoc
Merge branch 'master' of github.com:olegabr/framework into feature-apidoc

Conflicts:
	includes/qcubed/_core/base_controls/QControlBase.class.php
	includes/qcubed/_core/base_controls/QIntegerTextBox.class.php
	includes/qcubed/_core/base_controls/QLabel.class.php
	includes/qcubed/_core/base_controls/QLinkButton.class.php
	includes/qcubed/controls/QForm.class.php
The package statement is fixed from 'Controls  ' (with two spaces on the end) to 'Controls'
Merge pull request #215 from olegabr/feature-apidoc

Merge with master branch
Merge branch 'master' of github.com:olegabr/framework into feature-apidoc

Conflicts:
	includes/qcubed/_core/base_controls/QFormBase.class.php
The constant for encoding is copied into the config for the travis test
Merge pull request #265 from olegabr/feature-EncodingType

Validation logic is incorrect for non-english languages #264
Merge branch 'master' of github.com:olegabr/framework into feature-CacheProviderImprovement
Merge pull request #267 from olegabr/feature-CacheProviderImprovement

Problems with cache providers are solved