closes #675
Merge remote-tracking branch 'upstream/master'
Upgrade elasticjs
Fix an issue preventing loading dashboards from subfolders.
Merge remote-tracking branch 'upstream/master'