Committing current changes
Merge remote-tracking branch 'upstream/dev'
Merge branch 'master' of https://github.com/ShadowSam/Sphinx
Now you can not save a query with no name.
Merge remote-tracking branch 'upstream/dev'
Added functionality for showing admin status of all users to admin page. Also removed unused URL's in entity-state
Merge pull request #85 from ShadowSam/master

Admin page - showing admin status of all users
Admin page : you can now change the admin status of all other users.
Merge remote-tracking branch 'upstream/dev'
Merge pull request #86 from ShadowSam/master

Admin page - changing admin status of other users
Merging from dev
User name and email displayed on setting page
Users now have icons. I don't know why I did this instead of timestamps. Maybe because I got so fixiated on pokemon icons. Sanitation isn't being done for the image url.