Got PubNub to work through a Service
Merge branch 'master' of https://github.com/andrewpham/Kaleidoscope

Conflicts:
	.idea/libraries/library_1_2_1.xml
	app/app.iml
	app/build.gradle

horizontalImageScrollerAndroid/build/intermediates/bundles/debug/res/lay
out/horizontal_image_scroller_item.xml

horizontalImageScrollerAndroid/build/intermediates/bundles/debug/res/val
ues/values.xml

horizontalImageScrollerAndroid/build/intermediates/incremental/mergeAsse
ts/debug/merger.xml

horizontalImageScrollerAndroid/build/intermediates/incremental/packageRe
sources/debug/merger.xml