Working on implementing voting
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/quantumbadger/redreader/views/RedditCommentView.java
Working on implementing voting