trying to fix date combining
Made x axis discrete on barchart. and shorten date format.
Merge branch 'hotfix'

Conflicts:
	server.R