Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/fbhack/newsflash/FlashHead.java
	app/src/main/java/com/fbhack/newsflash/StatusItem.java
Merge remote-tracking branch 'origin/master'