merge
merge
added menu, drone view and refugee view