trash
Merge branch 'master' of https://github.com/ycliuhw/DataCollectionDaemon

Conflicts:
	MySQL_DB_Website/charts/templates/scatter_chart.html
	MySQL_DB_Website/default_db_for_admin.db
Merge branch 'master' of https://github.com/ycliuhw/DataCollectionDaemon
1111