investigation 49f677f5-d21f-456e-962c-79b2276c143f created by 10.0.1.200
changed to nt format
update entries in nt file, all tests pass
removed comments
Merge branch 'development' into nt_feature

Conflicts:
	application.rb
Merge branch 'development' into nt_feature
Merge branch 'nt_feature' into development