Working Calendar app. Feed does not work with and without events
Removed extra lines of code. Calendar is working but does not go to proper dashboard
Merge branch 'master' of https://github.com/mtarsel/dream-girlz