added admin templates
Merge branch 'master' of https://github.com/ycliuhw/MySQL_DB_Website

Conflicts:
	data_consolidation_daemon/tasks.py
	data_consolidation_daemon/utils/db_daemon.conf