Updated from dev branch
Updated from dev branch
New calendar views included
Small bugfixes for the new fragments
3.3 Release APK added