ticket:10 Added migrations for the ModelChange changes
ticket:10 Fixed pep8, also some bug fixes
ticket:10 Fixed pep8
ticket:10 Conflict resolution