Removed the qualifier from the version number since the update site could not cope with it
Added qualifier to version
Updated svn:ignore
copy the build.properties directory from the branch to the trunk
copy the META-INF directory from the branch to the trunk
Merged from branch
create directory to merge into trunk