updated feature with cancel scenarios and preventing multiple votes
Merge branch 'article_vote' of http://github.com/qpias/WebsiteOne into article_vote
Merged upstream develop
Merge branch 'article_vote' of https://github.com/johnnymo87/WebsiteOne into article_vote
Started extended testing for user voting
saving article before adding upvotes