Import lastest sandbox from shinesofware
Fix migrations
Merge pull request #46 from guestisp/master

Pull request to sync the code