Merge pull request #1 from ansonlouis/develop

Develop
fixed bower.json
Update bower.json
changed link location to polymer
Merge branch 'master' of https://github.com/ansonlouis/jsonymer

Conflicts:
	bower.json
image sprite bug
fixed property edit bug
spritify icons