Merge branch 'master' of https://bitbucket.org/EJEHardenberg/greenup
Merge branch 'master' of github.com:EJEHardenberg/GreenUp
Added communication to cards UI and changed header redirect on server to use cardsUI
Merge branch 'master' of github.com:EJEHardenberg/GreenUp