updated
Merge pull request #25 from meltmedia/develop

Develop
Update package.json
Merge branch 'master' of github.com:meltmedia/cadmium-admin into feature_url-update
Update package.json
with this feature pequod will update the package.json files proxy value
Merge branch 'master' of github.com:meltmedia/cadmium-admin into feature_url-update

Conflicts:
	package.json
Merge pull request #26 from meltmedia/feature_url-update

Feature url update - Pequod now will update the proxy value for the new cadmium url
Merge branch 'master' of github.com:meltmedia/cadmium-admin into develop