Moved the addon descriptor.
Updated addon.xml.
Upgraded plugin version number.
Added support for deploying addon.xml
Renamed back the java templates.