Classes fixed
Template work started
Merge branch 'master' into usecase1_dev1

Conflicts:
	wordengine/urls.py
	wordengine/views.py
Template work started
Initial data