Merge pull request #74 from GlitchTech/gh-pages

Kind description update
Added FileInputDecorator entry and fixed bad urls for my other enyo2 components
Merge pull request #75 from JayCanuck/gh-pages

Added FileInputDecorator
Add android.HSnapScroller component
Merge pull request #76 from appsbychris/gh-pages

Add android.HSnapScroller component
Change website and demo url

Changing to new location
Merge pull request #77 from appsbychris/gh-pages

Change website and demourl for hsnapscroller
Update gallery to use enyo 2.1.1
More Arrangers: Add demoUrl
Merge pull request #78 from ShiftyAxel/gh-pages

Add demoUrl for More Arrangers
Added Shape2D module to manifest
Updated the index.html
Fixed trailing comma
Merge pull request #79 from pcimino/gh-pages

Shape2D
webos-ports-lib: Add to gallery

Signed-Off-By: Josh Palmer <jpalmerwatkins@me.com>
webos-ports-lib: Update index.html

Signed-Off-By: Josh Palmer <jpalmerwatkins@me.com>
Merge pull request #80 from ShiftyAxel/gh-pages

webos-ports-lib
Added Gravatar kind
Merge branch 'gh-pages' of https://github.com/pcimino/gallery into gh-pages

Conflicts:
	gallery_manifest.json
	index.html
Update gallery_manifest.json

Fix extra brace added in merge