Merge remote-tracking branch 'origin/edodevelop'
Full Refactoring
Added Calendar API
Merge branch 'master' of https://github.com/Blutimauge/Application.git