Update manifest file in android-lib-Solutinno
Merge branch 'master' of /Users/balesz/Projects/android-WebSearch/lib/android-lib-Solutinno with conflicts.