Commit cleanup before iOS7 changes.
Adds LICENSE to git tracking.
Fixes LICENSE merge conflict.