add persistent controller n datasource, start playing with the signal strength listener
fix merge
move MainActivity to activities packege