Do some model changes for future development.
Deleted south because django 1.7 now has a built-in support for schema migrations, minor model changes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	db.sqlite3