Convenient for eclipse compile
remove unneeded launcher icon from vitamio module. Also remove old manifest merging since that bug is fixed in gradle 0.12.1
Merge pull request #174 from mutahirqureshi/asset-cleanup

Launcher assets cleanup & remove gradle 0.12.0 manifest merging bug workaround
Fix detect cpu error
Merge branch 'master' of https://github.com/yixia/VitamioBundle

# By Crossle Song (2) and mqureshi (1)
# Via Crossle Song
* 'master' of https://github.com/yixia/VitamioBundle:
  Fix detect cpu error
  remove unneeded launcher icon from vitamio module. Also remove old manifest merging since that bug is fixed in gradle 0.12.1
  Convenient for eclipse compile