Merge https://github.com/appsdesignjamaica/JN

Conflicts:
	.gitignore