Add ability to add file resources into a library project.
Make IS versioning work identical to OSGi versioning
Update merge from local master.