adding demo plus
fixing conflicts

Merge branch 'master' of https://github.com/dgrapov/DeviumWeb

Conflicts:
	README.md
	global.R