modernize
Merge remote-tracking branch 'origin/v3' into v3

Conflicts:
	Vibes/src/main/java/com/stiggpwnz/vibes/fragments/base/BaseProgressFragment.java
	Vibes/src/main/res/layout/main_root.xml
	Vibes/src/test/java/com/stiggpwnz/vibes/activities/MainActivityTest.java
	Vibes/src/test/java/com/stiggpwnz/vibes/adapters/FeedAdapterTest.java