test
test
testing static
from collect static.
fixed issue with btn-delete
Merge branch 'production'

Conflicts:
	_science/settings.py
	_science/urls.py
	_science/wsgi.py
Merge branch 'production' into ian

Conflicts:
	_article/templates/_article/article.html
Debug True.
Merge branch 'ian' of github.com:IanHung/_science
testing
Merge branch 'production'
Merge branch 'master' into production