[#31266] GSoC 2013 - Improved Template Manager (Fix #1875)
Merge branch 'master' of github.com:joomla/joomla-cms into gsoc-cloud-storage