some changes
ignore multiple files
ignored netbeans
Merge branch 'master' of https://github.com/jcow/jsonfrontendviewer

Conflicts:
	resources/javascript/templates.js
merged code
merged in misspellings
fixed some styling
lots of things