update
Merge branch 'v2' into gh-pages
update
Merge branch 'v2' into gh-pages
update
Add bower setting
Merge branch 'v2' into gh-pages
update
update
Merge branch 'develop'

Conflicts:
	bower.json
	egrid-core.js
Merge branch 'release/1.0.1'
Merge branch 'release/1.0.2'
Fix deploy setting
Merge branch 'master' into gh-pages
Update build setting
Update
Update
Add 'gh-pages/' from commit '1f70b3dd372abdc01aa1239def7231aaf4247f9b'

git-subtree-dir: gh-pages
git-subtree-mainline: 68585283bd161ffd4879fb3f0d13fc3a8bc3c00d
git-subtree-split: 1f70b3dd372abdc01aa1239def7231aaf4247f9b
Merge branch 'feature/gh-pages' into develop