Added library
Change Android Manifest
Fix inconsistency
Merge