Merge branch 'master' into ryan
Merge branch 'master' into ryan
sunday afternoon commit
Merge pull request #25 from 210geeks/ryan

Sunday afternoon commit
sunday evening commit
Merge branch 'master' into ryan
fixed user issue on devicescontroller
Merge pull request #26 from 210geeks/ryan

Ryan
added general admin panel view, started user CRUD
Merge pull request #27 from 210geeks/Joseph

added general admin panel view, started user CRUD
edit blade in progress, create blade 1st complete draft
Merge branch 'master' into ryan
Merge pull request #28 from 210geeks/ryan

Ryan