Fixed ic_launcher conflict
Merge pull request #164 from aint/master

Fixed ic_launcher conflict