move colum3D chart to public/charts
deleted iframe tag
Merge branch 'OAuth' of ssh://github.com/mk270/parliament2015 into OAuth

Conflicts:
	public/charts/column3D.html
Updated server.js adding OAuth
move amcharts to website
parlydev db
save copy
add hanson's version
updated package for dependencies
Merge branch 'master' into OAuth
Merge branch 'master' of ssh://github.com/mk270/parliament2015
add log
stop trying to trash database
Merge branch 'master' into use-own-iframe
Merge branch 'master' into OAuth
add 1pixel image
dump prod db
accept merge
pg version
unvandalise 404 system