fixing master
Merge remote-tracking branch 'origin/master' into dev_main

Conflicts:
	.idea/libraries/appcompat_v7_19_1_0.xml
	.idea/libraries/support_v4_19_1_0.xml
	app/app.iml
	app/build.gradle
	build.gradle
	gradle/wrapper/gradle-wrapper.properties
	lib/build.gradle
	lib/lib.iml
	listwidget/build.gradle
	listwidget/listwidget.iml
	twitch_stream/build.gradle
	twitch_stream/twitch_stream.iml
Update to SDK 21. Getting ready for L
Updating team activity. Coverting widgets to L and use card view.