merged upstream and view content
more stuff
Merge remote-tracking branch 'upstream/master'
user admin fail
nsync
Merge pull request #3 from ryanolsen/master

Upstream pull request