Merge branch 'development'
integrated one mailchimp mailing list
userprofileadmin re-added, copyright added, badges model removed
Merge branch 'master' into development
project modules upgraded to current versions, using django 1.5.4 now
conflicts of requirements between master and dev resolved
Merge branch 'development' of github.com:codesters/codesters into development