test
Merge branch 'master' of https://github.com/WowzLabs/OpenMigration

Conflicts:
	server/server.c
Merge branch 'master' of https://github.com/WowzLabs/OpenMigration
added new OpenMigration File
Merge branch 'master' of https://github.com/WowzLabs/OpenMigration