Merge pull request #25 from 210geeks/ryan

Sunday afternoon commit
sunday evening commit
Merge branch 'master' into ryan
fixed user issue on devicescontroller