Merge pull request #395 from bhariharan/unstable

Unified all API version strings to one place in Java and one place in XML
Added the ability to merge manifest files from library project