Update version information to master to 3.0.0_Alpha1 to prepare for
alpha1 release
Make the code style sniffer happy.
Merge remote-tracking branch 'origin/2.5.x'
Raise the minimum requirements to PHP 5.3.1 and drop legacy code.
Code style and consistency work in the installation.
Remove the CMS's JElement subclasses.
Merge branch '2.5.x'

Conflicts:
	installation/models/fields/sample.php
Merge branch '2.5.x'
Add a sniff for file comments.
Move JHtmlBatch and JHtmlCategory to the CMS libraries.
Merge remote-tracking branch 'origin/2.5.x'
Add more sniffs for whitespacing.
Remove deprecated CMS code from JToolBarHelper.
Correct licensing information for com_joomlaupdate
 # [#28779] *JS error in page 6 of installation. Thanks Michael
https://github.com/mbabker/joomla-cms/compare/multi_localise.diff
Merge branch '2.5.x' of https://github.com/joomla/joomla-cms
Merge branch 'master' of https://github.com/joomla/joomla-cms
Merge branch '2.5.x'
Merge remote-tracking branch 'origin/2.5.x'