Minor changes
Merge branch 'master' of https://github.com/tiagoetiene/civic-sentiment-db

Conflicts:
	civic-sentiment-db.js
	server/SaveSummary.js
	server/variables.js
Many change