Merge branch 'master' into routing

3rdparty/miniColors/GPL-LICENSE.txt

3rdparty/miniColors/MIT-LICENSE.txt

3rdparty/miniColors/css/images/colors.png

3rdparty/miniColors/css/images/trigger.png

3rdparty/miniColors/css/jquery.miniColors.css

3rdparty/miniColors/js/jquery.miniColors.js

3rdparty/miniColors/js/jquery.miniColors.min.js

3rdparty/openid/class.openid.v3.php

3rdparty/openid/phpmyid.php

apps/calendar/ajax/import/calendarcheck.php

apps/calendar/ajax/import/dialog.php

apps/calendar/ajax/import/dropimport.php

apps/calendar/ajax/import/import.php

apps/calendar/appinfo/app.php

apps/calendar/css/import.css

apps/calendar/js/calendar.js

apps/calendar/js/loader.js

apps/calendar/js/settings.js

apps/calendar/lib/calendar.php

apps/calendar/lib/import.php