pure js upload
init
Merge branch 'master' of https://github.com/cxhernandez/msmexplorer-d3

Conflicts:
	newrelic.ini