Tested with WebStorm, updated Node modules to most recent versions
Removed deprecated HTML tages in index.html
Not sure what these are, but must commit in order to merge
These files are causing git errors. Removing them.
Remove final file that conflicts with git commits.
Merge branch 'ari-mapdesign'

Conflicts:
	node_modules/body-parser/node_modules/qs/Readme.md
	node_modules/express/node_modules/fresh/History.md
	node_modules/express/node_modules/fresh/Readme.md
	node_modules/express/node_modules/proxy-addr/History.md
	node_modules/express/node_modules/proxy-addr/README.md
	node_modules/express/node_modules/qs/Readme.md
	node_modules/express/node_modules/range-parser/History.md
	node_modules/express/node_modules/range-parser/Readme.md
	node_modules/express/node_modules/serve-static/History.md
	node_modules/express/node_modules/serve-static/Readme.md