Fixed a null pointer exception.

Fixed activity heirarchy so back buttons work.
Merge branch 'master' of https://github.com/fatalaim/Notes