Redirect Unauth Users
updated
removed back log field
Merge pull request #24 from meltmedia/feature_pequod-fix

Feature pequod fix
Merge pull request #23 from meltmedia/feature_redirect-auth

Feature redirect auth
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
still working on test cases
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 feature_update-dates

Conflicts:
	deployment/services/src/main/java/com/meltmedia/cadmium/pequod/jersey/PequodResource.java