dependency location change
dependency changes
Merge branch '1.x'

Conflicts:
	medium.js
Merge branch 'master' of https://github.com/jakiestfu/Medium.js