First commit

For 2012 migration to new server