about to merge
Merge branch 'master' of https://github.com/sukwanlee/thoughtdots

Conflicts:
	templates/data_detail.html
	thoughtdots/loadnames.py
should be fixed