Merge remote-tracking branch 'upstream/master' into improveMain
add exit in menu for ad creation activities
add new class which holds common functionality for all ad funnel activities
remove option menu over-riding
remove unused menu xml files
merge ad funnel changes
improve error handling for retrieving company list/logos
get rid of unused methods in MapleApplication
change launcher icon to be maple logo
Merge pull request #142 from rpandey1234/fixLogin

Code clean up and add launcher icon