Fixed calendar building related issues. Added current year marker. Changed current week number calculation algorithm