Adding commons-launcher bin.
Minor change.
Handling merge conflicts.