Emulator OK from Architech 3

Emulator OK from Architech 3
Merge branch 'master' of https://github.com/SpyRefused/NotesApp

Conflicts:
	packager.json