First steps of refactoring, migrations required.
Merged changes from master
Created vota app with necessary models
Merge remote-tracking branch 'origin/dev' into dev
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
	.idea/visual_changelog.iml
	django_project/base/admin.py
	django_project/base/views/project.py
	django_project/changes/forms.py
	django_project/changes/views/entry.py
	fabfile.py
Merge branch 'dev'

Conflicts:
	django_project/changes/models/category.py
	fabfile.py
Updated dev_george