Added custom header, changed app icon, modified target sdk to the latest
Fix conflict