google analytics
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
sync up to 0.5.5
Merge branch 'master' of heroku.com:rtdb into heroku
jshint cleanup
Merge branch 'master' into heroku

Conflicts:
	db.js
	view.js
some sonar fixes and upgraded express due to a body parser warning
highchart implementation. migrate main to index.js
Merge branch 'master' of heroku.com:rtdb
highchart version
some fixes brought over from the salesforce branch
Dockerized
dockering
dockerizing
Merge branch 'master' into openshift

Conflicts:
	package.json
	views/layout.jade
	views/mlayout.jade
	views/mparcelsws.jade