Merge pull request #28 from thatcoderguy/master

merge changes
Updated editpermissions - stil need to populate missing user + added new fields to initial migration
Merge pull request #67 from widagroup/master

 Updated editpermissions - stil need to populate missing user + added  new fields to initial migration