colors fixes and operator icon fixes
conflict fixes
Merge branch 'master' of github.com:RohitRox/telephony_in_nepal