Bug fixes in migrations, now uses migrations table
merge development into master