Ticket_13: added migrations
Merge branch 'Ticket_10'