Update
Merge branch 'jl'

Conflicts:
	Resources/Sketch/Comment Post With Keyboard sketch/Data
	Resources/Sketch/Comment Post With Keyboard sketch/QuickLook/Preview.png
	Resources/Sketch/Comment Post With Keyboard sketch/QuickLook/Thumbnail.png
	Resources/Sketch/Comment Post With Keyboard sketch/metadata
	Resources/Sketch/Comment Post With Keyboard sketch/version
	Resources/Sketch/Home Hangouts Page WIth Navigation bar sketch/Data
	Resources/Sketch/Home Hangouts Page WIth Navigation bar sketch/QuickLook/Preview.png
	Resources/Sketch/Home Hangouts Page WIth Navigation bar sketch/QuickLook/Thumbnail.png
	Resources/Sketch/Home Hangouts Page WIth Navigation bar sketch/metadata
	Resources/Sketch/Home Hangouts Page WIth Navigation bar sketch/version
	Resources/Sketch/Home Hangouts Page sketch/Data
	Resources/Sketch/Home Hangouts Page sketch/QuickLook/Preview.png
	Resources/Sketch/Home Hangouts Page sketch/QuickLook/Thumbnail.png
	Resources/Sketch/Home Hangouts Page sketch/metadata
	Resources/Sketch/Home Hangouts Page sketch/version
	Resources/Sketch/Login Keyboard sketch/version
	Resources/Sketch/Login Page sketch/Data
	Resources/Sketch/Login Page sketch/QuickLook/Preview.png
	Resources/Sketch/Login Page sketch/QuickLook/Thumbnail.png
	Resources/Sketch/Login Page sketch/metadata
	Resources/Sketch/Login Page sketch/version
	Resources/Sketch/Map Search sketch/Data
	Resources/Sketch/Map Search sketch/QuickLook/Preview.png
	Resources/Sketch/Map Search sketch/QuickLook/Thumbnail.png
	Resources/Sketch/Map Search sketch/metadata
	Resources/Sketch/Map Search sketch/version
	Resources/Sketch/Map View  sketch/Data
	Resources/Sketch/Map View  sketch/QuickLook/Preview.png
	Resources/Sketch/Map View  sketch/QuickLook/Thumbnail.png
	Resources/Sketch/Map View  sketch/metadata
	Resources/Sketch/Map View  sketch/version
	Resources/Sketch/Splash Screen sketch/Data
	Resources/Sketch/Splash Screen sketch/QuickLook/Preview.png
	Resources/Sketch/Splash Screen sketch/QuickLook/Thumbnail.png
	Resources/Sketch/Splash Screen sketch/metadata
	Resources/Sketch/Splash Screen sketch/version
	Resources/Sketch/Trail View page sketch/Data
	Resources/Sketch/Trail View page sketch/QuickLook/Preview.png
	Resources/Sketch/Trail View page sketch/QuickLook/Thumbnail.png
	Resources/Sketch/Trail View page sketch/metadata
	Resources/Sketch/Trail View page sketch/version
	Resources/Sketch/swipe login sketch/Data
	Resources/Sketch/swipe login sketch/QuickLook/Preview.png
	Resources/Sketch/swipe login sketch/QuickLook/Thumbnail.png
	Resources/Sketch/swipe login sketch/metadata