standardized the gae environment to 1.7.5
Added additional resolution types
merged with master
Merge branch 'master' of github.com:atdigdug/MavinCampaignManagement