Added migrations from ithinksw/master to melinath/master