Merge local changes from desktop PC
Transfer NoNetwork activity to Framework and make it globally accessible
Some string additions and deletions