Merge pull request #7 from mendyismyname/master

fixed merge conflict
Merge pull request #8 from mendyismyname/master

removed nested users. fixed archive buttons
Merge pull request #9 from mendyismyname/master

fixed last reminance of users in url
Merge pull request #10 from mendyismyname/master

fixed last reminance of users in url
added authentications to article and collection controller
Merge branch 'master' of github.com:mandyyeung/parascope
fixed collection