Added a feature to the project
Generated the update site
Ignoring the files generated by the site builder
Updated the version numbers
Added upload script
Gave the feature a name
Merge branch 'refs/heads/master' into update-site
Merge branch 'refs/heads/update-site' into master-org

Conflicts:
	edu.oregonstate.cope.eclipse/META-INF/MANIFEST.MF