Template wizard was moved out of templates/admin. Urls were updated. Now all of my links are generated with django tags the correct way (i.e. {% url 'asfaasf' %} instead of hard coded. I noticed ShareTemplate is now broken, since Ken deleted the Researcher model.
Merge branch 'master' of https://github.com/djorda9/Simulated-Conversations

Conflicts:
	vagrant/simcon/urls.py