PR for code review

deleted static Context na po and changet to getApplicationContext();