fix conflictions, libs definitions
merge with upstream
Merge pull request #9 from eneim/nam_mobile_ui

Nam mobile ui