Device functionality added and factor list availble
Merge branch 'master' of git://github.com/SocialCity/ServerBackEnd