removing .DS_Store files
added front end
added basic class structure for models
Merge pull request #18 from meltmedia/feature#front-end

added front end
Merge branch 'develop#pequod' of github.com:meltmedia/cadmium-admin into feature#backend
moved packages and stubbed out the PequodResource
added Pequod request object
CADMIUM-175: added backend rest endpoint to trigger auto discovery and
split out a separate status and auth only update scheduled task.
stubbed out jiraService and PequodConfig
Added junit tests
pequod YO
Merge pull request #19 from meltmedia/feature#backend

Feature#backend
Merge pull request #20 from meltmedia/develop#pequod

Develop#pequod
Merge branch 'master' of github.com:meltmedia/cadmium-admin into feature#split-out-discovery

Conflicts:
	deployment/services/src/main/java/com/meltmedia/cadmium/admin/guice/Module.java
almost done :)
Merge branch 'feature#split-out-discovery' of github.com:meltmedia/cadmium-admin into feature_pequod-jira-fix

Conflicts:
	deployment/services/src/main/java/com/meltmedia/cadmium/admin/jersey/CookieBasedAuthorizationService.java
all done and tested locally
Merge pull request #21 from meltmedia/feature_pequod-jira-fix

Feature pequod jira fix
Updating with missing env name
Merge branch 'feature#split-out-discovery' of github.com:meltmedia/cadmium-admin into feature#split-out-discovery