Change NoteActivity. update manifest for testing.
Merge branch 'master' of https://github.com/Drakesinger/SmartHome