Implements a single version for 1.5 and 2.5, with branch changes

After this PR, we could easily drop all 1-5/2-5 branches and have just this single version for Joomla 1.5 and 2.5.