Merge pull request #215 from prakashpp/develop

Use current_user instead
Migration allowed from 3.0 only